Handle when Sprite render key not in SpriteAtlas

* Resolves #1169
AssetRipper · Feb 20, 2024 · 563e52e · 563e52e
1 parent 669a55d
commit 563e52e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Source/AssetRipper.Processing/Textures/SpriteProcessor.cs b/Source/AssetRipper.Processing/Textures/SpriteProcessor.cs
@@ -79,7 +79,7 @@ private static void ProcessSprite(ISprite sprite)
 			// Otherwise, if a SpriteAtlas reference is serialized into this sprite,
 			// we must recover the m_RD field of the sprite from the SpriteAtlas.
 			ISpriteAtlas? atlas = sprite.SpriteAtlasP;
-			if (atlas is not null && sprite.Has_SpriteAtlas())
+			if (atlas is not null)
 			{
 				if (sprite.Has_RenderDataKey() &&
 					atlas.RenderDataMap.TryGetValue(sprite.RenderDataKey, out ISpriteAtlasData? spriteData))

diff --git a/Source/AssetRipper.SourceGenerated.Extensions/SpriteExtensions.cs b/Source/AssetRipper.SourceGenerated.Extensions/SpriteExtensions.cs
@@ -27,16 +27,15 @@ public static void GetSpriteCoordinatesInAtlas(this ISprite sprite, ISpriteAtlas
 			// if sprite doesn't belong to an atlas, consider its image as single sprite atlas
 
 			Vector2 cropBotLeft;
-			if (atlas is null || !sprite.Has_RenderDataKey())
+			if (atlas is not null && sprite.Has_RenderDataKey() && atlas.RenderDataMap.TryGetValue(sprite.RenderDataKey, out ISpriteAtlasData? atlasData))
 			{
-				sAtlasRect = sprite.RD.TextureRect.CastToStruct();
-				cropBotLeft = (Vector2)sprite.RD.TextureRectOffset;
+				sAtlasRect = atlasData.TextureRect.CastToStruct();
+				cropBotLeft = (Vector2)atlasData.TextureRectOffset;
 			}
 			else
 			{
-				ISpriteAtlasData atlasData = atlas.RenderDataMap[sprite.RenderDataKey];
-				sAtlasRect = atlasData.TextureRect.CastToStruct();
-				cropBotLeft = (Vector2)atlasData.TextureRectOffset;
+				sAtlasRect = sprite.RD.TextureRect.CastToStruct();
+				cropBotLeft = (Vector2)sprite.RD.TextureRectOffset;
 			}
 
 			Vector2 sizeDelta = sprite.Rect.Size() - sAtlasRect.Size();