From a7776e124cda07bc69bae504eebe6ccdb14bb07f Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 22 Apr 2013 00:22:31 -0700
Subject: [PATCH] Only set mNonAccumRoot from mSkelBase

---
 apps/openmw/mwrender/animation.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 31f54107e..54416c45a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -98,7 +98,15 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
             boneiter.getNext()->setManuallyControlled(true);
 
         Ogre::SkeletonInstance *baseinst = mSkelBase->getSkeleton();
-        if(mSkelBase != objlist.mSkelBase)
+        if(mSkelBase == objlist.mSkelBase)
+        {
+            if(objlist.mTextKeys.size() > 0)
+            {
+                mAccumRoot = mInsert;
+                mNonAccumRoot = baseinst->getBone(objlist.mTextKeys.begin()->first);
+            }
+        }
+        else
         {
             for(size_t i = 0;i < objlist.mControllers.size();i++)
             {
@@ -113,15 +121,6 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
                 dstval->setNode(bone);
             }
         }
-
-        if(objlist.mTextKeys.size() > 0)
-        {
-            if(!mNonAccumRoot)
-            {
-                mAccumRoot = mInsert;
-                mNonAccumRoot = baseinst->getBone(objlist.mTextKeys.begin()->first);
-            }
-        }
     }
     for(size_t i = 0;i < objlist.mControllers.size();i++)
     {