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

When a controller is present more than once in the same keyframe file, pick the first one (Fixes #2719)

Browse source
This commit is contained in:
scrawl 2016-03-26 14:58:36 +01:00
parent eba8b4a518
commit bc36269617
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/nifosg/nifloader.cpp
View file

@ -333,7 +333,10 @@ namespace NifOsg
osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr())); osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr()));
callback->setFunction(boost::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key))); callback->setFunction(boost::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
target.mKeyframeControllers[strdata->string] = callback; if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end())
std::cerr << "Warning: controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version" << std::endl;
else
target.mKeyframeControllers[strdata->string] = callback;
} }
} }