mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-04 10:45:32 +00:00
Code Issues Releases Wiki Activity

Fix nested callbacks bug

Browse source
This commit is contained in:
scrawl 2015-04-25 15:10:37 +02:00
parent 372a54bbc7
commit 2db097f80e
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -549,9 +549,16 @@ namespace MWRender
{ {
osg::Node* node = it->first; osg::Node* node = it->first;
node->removeUpdateCallback(it->second); node->removeUpdateCallback(it->second);
// Should be no longer needed with OSG 3.4
it->second->setNestedCallback(NULL);
} }
if (mResetAccumRootCallback && mAccumRoot) if (mResetAccumRootCallback && mAccumRoot)
{
mAccumRoot->removeUpdateCallback(mResetAccumRootCallback); mAccumRoot->removeUpdateCallback(mResetAccumRootCallback);
// Should be no longer needed with OSG 3.4
mResetAccumRootCallback->setNestedCallback(NULL);
}
mAnimSourceControllers.clear(); mAnimSourceControllers.clear();
mAccumCtrl = NULL; mAccumCtrl = NULL;
@ -589,6 +596,7 @@ namespace MWRender
{ {
mAccumCtrl = it->second; mAccumCtrl = it->second;
// make sure reset is last in the chain of callbacks
if (!mResetAccumRootCallback) if (!mResetAccumRootCallback)
{ {
mResetAccumRootCallback = new ResetAccumRootCallback; mResetAccumRootCallback = new ResetAccumRootCallback;