This commit is contained in:
Perfare
2020-03-24 10:42:39 +08:00
parent 48ca96807f
commit ada26db659
4 changed files with 13 additions and 8 deletions

View File

@ -717,7 +717,7 @@ namespace AssetStudio
return iMat;
}
private void ConvertTexture2D(Texture2D tex2D, string name)
private void ConvertTexture2D(Texture2D m_Texture2D, string name)
{
var iTex = ImportedHelpers.FindTexture(name, TextureList);
if (iTex != null)
@ -725,7 +725,7 @@ namespace AssetStudio
return;
}
var bitmap = new Texture2DConverter(tex2D).ConvertToBitmap(true);
var bitmap = m_Texture2D.ConvertToBitmap(true);
if (bitmap != null)
{
using (var stream = new MemoryStream())

View File

@ -30,8 +30,7 @@ namespace AssetStudio
private static Bitmap CutImage(Texture2D m_Texture2D, Sprite m_Sprite, RectangleF textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw)
{
var texture2D = new Texture2DConverter(m_Texture2D);
var originalImage = texture2D.ConvertToBitmap(false);
var originalImage = m_Texture2D.ConvertToBitmap(false);
if (originalImage != null)
{
using (originalImage)
@ -63,6 +62,7 @@ namespace AssetStudio
break;
}
}
//Tight
if (settingsRaw.packingMode == SpritePackingMode.kSPMTight)
{