mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

sceneutil/attach: inherit the UserDataContainer to avoid the resource cache from being cleared incorrectly

Browse source
This commit is contained in:
scrawl 2017-04-14 15:04:53 +02:00
parent 17125e6c4d
commit 8f71b65d38
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/sceneutil/attach.cpp
View file

@ -87,6 +87,8 @@ namespace SceneUtil
{ {
osg::ref_ptr<osg::Group> handle = new osg::Group; osg::ref_ptr<osg::Group> handle = new osg::Group;
osg::UserDataContainer* udc = toAttach->getUserDataContainer();
CopyRigVisitor copyVisitor(handle, filter); CopyRigVisitor copyVisitor(handle, filter);
toAttach->accept(copyVisitor); toAttach->accept(copyVisitor);
copyVisitor.doCopy(); copyVisitor.doCopy();
@ -96,11 +98,13 @@ namespace SceneUtil
osg::ref_ptr<osg::Node> newHandle = handle->getChild(0); osg::ref_ptr<osg::Node> newHandle = handle->getChild(0);
handle->removeChild(newHandle); handle->removeChild(newHandle);
master->asGroup()->addChild(newHandle); master->asGroup()->addChild(newHandle);
newHandle->setUserDataContainer(udc);
return newHandle; return newHandle;
} }
else else
{ {
master->asGroup()->addChild(handle); master->asGroup()->addChild(handle);
handle->setUserDataContainer(udc);
return handle; return handle;
} }
} }