mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2766 from Capostrophic/collisionswitch

Browse Source 
Make extra sure groups with special behavior aren't optimized out
This commit is contained in:
Andrei Kortunov 2020-04-11 08:48:59 +04:00 committed by GitHub
commit 74c121a69d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/nifosg/nifloader.cpp
View File

@ -457,7 +457,7 @@ namespace NifOsg
{ {
const Nif::NiLODNode* niLodNode = static_cast<const Nif::NiLODNode*>(nifNode); const Nif::NiLODNode* niLodNode = static_cast<const Nif::NiLODNode*>(nifNode);
node = handleLodNode(niLodNode); node = handleLodNode(niLodNode);
dataVariance = osg::Object::STATIC; dataVariance = osg::Object::DYNAMIC;
break; break;
} }
case Nif::RC_NiSwitchNode: case Nif::RC_NiSwitchNode:
@ -476,8 +476,8 @@ namespace NifOsg
{ {
bool enabled = nifNode->flags & Nif::NiNode::Flag_ActiveCollision; bool enabled = nifNode->flags & Nif::NiNode::Flag_ActiveCollision;
node = new CollisionSwitch(nifNode->trafo.toMatrix(), enabled); node = new CollisionSwitch(nifNode->trafo.toMatrix(), enabled);
dataVariance = osg::Object::STATIC; // This matrix transform must not be combined with another matrix transform.
dataVariance = osg::Object::DYNAMIC;
break; break;
} }
default: default: