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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-19 11:27:35 +02:00
commit 1566f3568d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -935,8 +935,10 @@ namespace MWRender
void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature) void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature)
{ {
osg::ref_ptr<osg::StateSet> previousStateset;
if (mObjectRoot) if (mObjectRoot)
{ {
previousStateset = mObjectRoot->getStateSet();
mObjectRoot->getParent(0)->removeChild(mObjectRoot); mObjectRoot->getParent(0)->removeChild(mObjectRoot);
} }
mObjectRoot = NULL; mObjectRoot = NULL;
@ -961,6 +963,9 @@ namespace MWRender
mObjectRoot = newObjectRoot; mObjectRoot = newObjectRoot;
} }
if (previousStateset)
mObjectRoot->setStateSet(previousStateset);
if (baseonly) if (baseonly)
{ {
RemoveDrawableVisitor removeDrawableVisitor; RemoveDrawableVisitor removeDrawableVisitor;