From 86fda1bff6dab4a121de0c115557baf2241bb683 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 25 Apr 2013 00:52:26 -0700
Subject: [PATCH] Only set mSkelBase from the first objectlist

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

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 8d6508aee..7383734ee 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -106,7 +106,7 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
     NifOgre::ObjectList &objlist = obj.mObjectList;
     if(objlist.mSkelBase)
     {
-        if(!mSkelBase)
+        if(mObjects.size() == 1)
             mSkelBase = objlist.mSkelBase;
 
         Ogre::AnimationStateSet *aset = objlist.mSkelBase->getAllAnimationStates();
@@ -125,7 +125,9 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
         Ogre::Skeleton::BoneIterator boneiter = skelinst->getBoneIterator();
         while(boneiter.hasMoreElements())
             boneiter.getNext()->setManuallyControlled(true);
-
+    }
+    if(objlist.mSkelBase && mSkelBase)
+    {
         Ogre::SkeletonInstance *baseinst = mSkelBase->getSkeleton();
         if(mSkelBase == objlist.mSkelBase)
         {
@@ -286,6 +288,9 @@ NifOgre::TextKeyMap::const_iterator Animation::findGroupStart(const NifOgre::Tex
 
 bool Animation::hasAnimation(const std::string &anim)
 {
+    if(!mSkelBase)
+        return false;
+
     for(std::vector<ObjectInfo>::const_iterator iter(mObjects.begin());iter != mObjects.end();iter++)
     {
         if(iter->mObjectList.mTextKeys.size() == 0)
@@ -521,6 +526,9 @@ bool Animation::play(const std::string &groupname, const std::string &start, con
     // TODO: parameterize this
     size_t layeridx = 0;
 
+    if(!mSkelBase)
+        return false;
+
     for(std::vector<ObjectInfo>::iterator iter(mObjects.begin());iter != mObjects.end();iter++)
         iter->mActiveLayers &= ~(1<<layeridx);