Merged pull request #1815

CHANGELOG.md

@@ -21,6 +21,7 @@
     Bug #3876: Landscape texture painting is misaligned
     Bug #3897: Have Goodbye give all choices the effects of Goodbye
     Bug #3911: [macOS] Typing in the "Content List name" dialog box produces double characters
+    Bug #3950: FLATTEN_STATIC_TRANSFORMS optimization breaks animated collision shapes
     Bug #3993: Terrain texture blending map is not upscaled
     Bug #3997: Almalexia doesn't pace
     Bug #4036: Weird behaviour of AI packages if package target has non-unique ID

apps/openmw/mwphysics/physicssystem.cpp

@@ -626,7 +626,6 @@ namespace MWPhysics
             assert (mShapeInstance->getCollisionShape()->isCompound());
 
             btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
-
             for (std::map<int, int>::const_iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end(); ++it)
             {
                 int recIndex = it->first;
@@ -640,6 +639,9 @@ namespace MWPhysics
                     if (!visitor.mFound)
                     {
                         std::cerr << "Error: animateCollisionShapes can't find node " << recIndex << " for " << mPtr.getCellRef().getRefId() << std::endl;
+
+                        // Remove nonexistent nodes from animated shapes map and early out
+                        mShapeInstance->mAnimatedShapes.erase(recIndex);
                         return;
                     }
                     osg::NodePath nodePath = visitor.mFoundPath;

components/nifosg/nifloader.cpp

@@ -547,6 +547,11 @@ namespace NifOsg
                 node->setDataVariance(osg::Object::DYNAMIC);
             }
 
+            if (nifNode->recType == Nif::RC_NiTriShape && isAnimated) // the same thing for animated NiTriShapes
+            {
+                node->setDataVariance(osg::Object::DYNAMIC);
+            }
+
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
             applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags);