mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix setting up active controllers

Browse Source
This commit is contained in:
Chris Robinson 2013-04-23 19:43:26 -07:00
parent 634b0fd067
commit 7e2995bc2f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwrender/animation.cpp
View File

@ -155,6 +155,8 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
if(objlist.mControllers[i].getSource().isNull()) if(objlist.mControllers[i].getSource().isNull())
objlist.mControllers[i].setSource(mAnimationBaseValuePtr); objlist.mControllers[i].setSource(mAnimationBaseValuePtr);
} }
mActiveCtrls.insert(mActiveCtrls.end(), objlist.mControllers.begin(), objlist.mControllers.end());
} }
void Animation::setRenderProperties(const NifOgre::ObjectList &objlist, Ogre::uint32 visflags, Ogre::uint8 solidqueue, Ogre::uint8 transqueue) void Animation::setRenderProperties(const NifOgre::ObjectList &objlist, Ogre::uint32 visflags, Ogre::uint8 solidqueue, Ogre::uint8 transqueue)
@ -231,7 +233,7 @@ void Animation::updateActiveControllers()
{ {
for(obj = mObjects.begin();obj != mObjects.end();obj++) for(obj = mObjects.begin();obj != mObjects.end();obj++)
{ {
if((obj->mActiveLayers&(1<<layer))) if((obj->mActiveLayers&(1<<nextlayer)))
break; break;
} }
} }