Revert move of default anim rename

6 months ago · 56a40577ed
parent 03413a895f
commit 56a40577ed
2 changed files with 6 additions and 4 deletions
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@ -86,6 +86,12 @@ namespace Resource
        {
            if (animation)
            {
+                //"Default" is osg dae plugin's default naming scheme for unnamed animations
+                if (animation->getName() == "Default")
+                {
+                    animation->setName(std::string("idle"));
+                }
+
                osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
                const std::string animationName = animation->getName();
                mergedAnimationTrack->setName(animationName);
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@ -437,10 +437,6 @@ namespace Resource
            {
                if (animation)
                {
-                    // "Default" is osg dae plugin's default naming scheme for unnamed animations
-                    if (animation->getName() == "Default")
-                        animation->setName(std::string("idle"));
-
                    auto& channels = animation->getChannels();
                    for (auto& channel : channels)
                    {