mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-26 13:50:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when SpriteAtlas is missing

Browse Source
This commit is contained in:
VaDiM 2023-10-28 02:14:59 +03:00
parent ed7b0a2415
commit 45bf9251c9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AssetStudio/AssetsManager.cs
View File

@ -41,7 +41,7 @@ namespace AssetStudio
{ {
filteredAssetTypesList.Add(ClassIDType.Texture2D); filteredAssetTypesList.Add(ClassIDType.Texture2D);
} }
filteredAssetTypesList.UnionWith(classIDTypes); filteredAssetTypesList.UnionWith(classIDTypes);
} }
@ -635,14 +635,17 @@ namespace AssetStudio
{ {
m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas); m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas);
} }
else else if (m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlaOld))
{ {
m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlaOld);
if (m_SpriteAtlaOld.m_IsVariant) if (m_SpriteAtlaOld.m_IsVariant)
{ {
m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas); m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas);
} }
} }
else
{
Logger.Warning($"\"{m_Sprite.m_Name}\": Sprite loading error. SpriteAtlas with PathID: \"{m_Sprite.m_SpriteAtlas.m_PathID}\" was not found.");
}
} }
} }
} }