Merge branch 'no-more-oversized-demons' into 'master'

Don't apply scale in RotateController

See merge request OpenMW/openmw!4284

apps/openmw/mwrender/rotatecontroller.cpp

@@ -37,15 +37,12 @@ namespace MWRender
         osg::Matrix matrix = node->getMatrix();
 
         osg::Quat worldOrient;
-        osg::Vec3d worldScale(1.0, 1.0, 1.0);
-
         osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
 
         if (!nodepaths.empty())
         {
             osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
             worldOrient = worldMat.getRotate();
-            worldScale = worldMat.getScale();
         }
 
         osg::Quat worldOrientInverse = worldOrient.inverse();
@@ -54,8 +51,6 @@ namespace MWRender
         matrix.setRotate(orient);
         matrix.setTrans(matrix.getTrans() + worldOrientInverse * mOffset);
 
-        matrix *= osg::Matrix::scale(worldScale);
-
         node->setMatrix(matrix);
 
         // If we are linked to a bone we must call setMatrixInSkeletonSpace