mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix invisibility effect disappearing after a view mode switch

Browse Source
This commit is contained in:
scrawl 2015-09-18 21:29:32 +02:00
parent b58a63e14e
commit a37dee09e2
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;