krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #238 from OpenMW/master

Browse source 
Add OpenMW commits up to 11 Jul 2017
This commit is contained in:
David Cernat 2017-07-11 03:37:53 +03:00 committed by GitHub
commit 6f6a3ae74d
2 changed files with 6 additions and 6 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);

2
components/resource/scenemanager.cpp
View file

@ -452,7 +452,7 @@ namespace Resource
{ {
std::string str(env); std::string str(env);
if(str.find("OFF")!=std::string::npos) options = 0; if(str.find("OFF")!=std::string::npos || str.find("0")!= std::string::npos) options = 0;
if(str.find("~FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options ^= Optimizer::FLATTEN_STATIC_TRANSFORMS; if(str.find("~FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options ^= Optimizer::FLATTEN_STATIC_TRANSFORMS;
else if(str.find("FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options |= Optimizer::FLATTEN_STATIC_TRANSFORMS; else if(str.find("FLATTEN_STATIC_TRANSFORMS")!=std::string::npos) options |= Optimizer::FLATTEN_STATIC_TRANSFORMS;