From f27f0ef4fc865d14eee1d7f400e7ee8e30e12ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Wed, 13 Mar 2024 09:51:53 +0100
Subject: [PATCH] fix: apply stashCrossFade to correct entity

---
 libs/gltfio/src/Animator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/gltfio/src/Animator.cpp b/libs/gltfio/src/Animator.cpp
index 99a4269d02..e7cdffd6e0 100644
--- a/libs/gltfio/src/Animator.cpp
+++ b/libs/gltfio/src/Animator.cpp
@@ -368,7 +368,8 @@ void AnimatorImpl::stashCrossFade() {
         return index;
     };
 
-    const Instance root = tm.getInstance(asset->mRoot);
+    const Entity rootEntity = instance ? instance->getRoot() : asset->mRoot;
+    const Instance root = tm.getInstance(rootEntity);
     const size_t count = recursiveCount(root, 0, recursiveCount);
     crossFade.reserve(count);
     crossFade.resize(count);