Merged pull request #1869

CHANGELOG.md

@@ -105,6 +105,7 @@
     Bug #4591: Attack strength should be 0 if player did not hold the attack button
     Bug #4597: <> operator causes a compile error
     Bug #4604: Picking up gold from the ground only makes 1 grabbed
+    Bug #4607: Scaling for animated collision shapes is applied twice
     Feature #1645: Casting effects from objects
     Feature #2606: Editor: Implemented (optional) case sensitive global search
     Feature #3083: Play animation when NPC is casting spell via script

apps/openmw/mwphysics/physicssystem.cpp

@@ -650,7 +650,6 @@ namespace MWPhysics
 
                 osg::NodePath& nodePath = nodePathFound->second;
                 osg::Matrixf matrix = osg::computeLocalToWorld(nodePath);
-                osg::Vec3f scale = matrix.getScale();
                 matrix.orthoNormalize(matrix);
 
                 btTransform transform;
@@ -659,8 +658,8 @@ namespace MWPhysics
                     for (int j=0; j<3; ++j)
                         transform.getBasis()[i][j] = matrix(j,i); // NB column/row major difference
 
-                if (compound->getLocalScaling() * toBullet(scale) != compound->getChildShape(shapeIndex)->getLocalScaling())
-                    compound->getChildShape(shapeIndex)->setLocalScaling(compound->getLocalScaling() * toBullet(scale));
+                // Note: we can not apply scaling here for now since we treat scaled shapes
+                // as new shapes (btScaledBvhTriangleMeshShape) with 1.0 scale for now
                 if (!(transform == compound->getChildTransform(shapeIndex)))
                     compound->updateChildTransform(shapeIndex, transform);
             }