krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Only set mNonAccumRoot from mSkelBase

Browse source
This commit is contained in:
Chris Robinson 2013-04-22 00:22:31 -07:00
parent a3511c62cf
commit a7776e124c
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwrender/animation.cpp
View file

@ -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++)
{