mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 13:09:40 +00:00
Code Issues Releases Wiki Activity

Fix checking a variable before it's assigned (Bug #3950)

Browse source
This commit is contained in:
scrawl 2017-07-10 23:50:24 +02:00
parent be940656db
commit 40dc1dd6f5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/nifosg/nifloader.cpp
View file

@ -623,11 +623,6 @@ namespace NifOsg
node->setNodeMask(0x1); node->setNodeMask(0x1);
} }
if (skipMeshes && isAnimated) // make sure the empty node is not optimized away so the physicssystem can find it.
{
node->setDataVariance(osg::Object::DYNAMIC);
}
// We can skip creating meshes for hidden nodes if they don't have a VisController that // We can skip creating meshes for hidden nodes if they don't have a VisController that
// might make them visible later // might make them visible later
if (nifNode->flags & Nif::NiNode::Flag_Hidden) if (nifNode->flags & Nif::NiNode::Flag_Hidden)
@ -643,6 +638,11 @@ namespace NifOsg
node->setNodeMask(0x1); node->setNodeMask(0x1);
} }
if (skipMeshes && isAnimated) // make sure the empty node is not optimized away so the physicssystem can find it.
{
node->setDataVariance(osg::Object::DYNAMIC);
}
osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater; osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags); applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags);