From 37c8c63fc566c115aa3f974b6d23bb12f62caa05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Jun 2021 16:18:04 +0900
Subject: [PATCH] Ensure all frames in an animation are retrieved from the same
 skin

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index d8fb1fa664..6e8276c01e 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -54,9 +54,16 @@ namespace osu.Game.Skinning
 
             IEnumerable<Texture> getTextures()
             {
+                ISkin lookupSource = null;
+
                 for (int i = 0; true; i++)
                 {
-                    if ((texture = source.GetTexture($"{componentName}{animationSeparator}{i}", wrapModeS, wrapModeT)) == null)
+                    string frameName = $"{componentName}{animationSeparator}{i}";
+
+                    // ensure all textures are retrieved from the same skin source.
+                    lookupSource ??= source.FindProvider(s => s.GetTexture(frameName, wrapModeS, wrapModeT) != null);
+
+                    if ((texture = lookupSource?.GetTexture(frameName, wrapModeS, wrapModeT)) == null)
                         break;
 
                     yield return texture;