From 97fadb24ca5b97cdced575612ba269e8d205f74e Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 27 Nov 2013 18:46:18 +0100 Subject: [PATCH] Update the Ptr in mObjects in Objects::updateObjectCell --- apps/openmw/mwrender/objects.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp index 4d5f6872d..827b9b52a 100644 --- a/apps/openmw/mwrender/objects.cpp +++ b/apps/openmw/mwrender/objects.cpp @@ -278,7 +278,17 @@ void Objects::updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &cur) } else { node = mCellSceneNodes[newCell]; } + node->addChild(cur.getRefData().getBaseNode()); + + PtrAnimationMap::iterator iter = mObjects.find(old); + if(iter != mObjects.end()) + { + ObjectAnimation *anim = iter->second; + mObjects.erase(iter); + anim->updatePtr(cur); + mObjects[cur] = anim; + } } ObjectAnimation* Objects::getAnimation(const MWWorld::Ptr &ptr)