Merge branch 'collisionswitch' into 'master'

Don't let the optimizer mess with collision switch nodes (again) See merge request OpenMW/openmw!4173
OpenMW · Jun 15, 2024 · 8e20967 · 8e20967
2 parents 98ba212 + 4f8856f
commit 8e20967
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
@@ -741,7 +741,11 @@ namespace NifOsg
  }
 
  if (nifNode->recType == Nif::RC_NiCollisionSwitch && !nifNode->collisionActive())
+ {
  node->setNodeMask(Loader::getIntersectionDisabledNodeMask());
+ // Don't let the optimizer mess with this node
+ node->setDataVariance(osg::Object::DYNAMIC);
+ }
 
  osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;