#5949: Don't update the renderable geometry in StaticModelNode::_onTr…

…ansformationChanged() if nothing has changed

radiantcore/model/StaticModel.cpp

@@ -274,9 +274,12 @@ void StaticModel::setModelPath(const std::string& modelPath)
     _modelPath = modelPath;
 }
 
-void StaticModel::revertScale()
+bool StaticModel::revertScale()
 {
+    if (_scaleTransformed == _scale) return false;
+
     _scaleTransformed = _scale;
+    return true;
 }
 
 void StaticModel::evaluateScale(const Vector3& scale)

radiantcore/model/StaticModel.h

@@ -202,8 +202,8 @@ class StaticModel :
 	 */
 	const SurfaceList& getSurfaces() const;
 
-	// Revert to base scale
-	void revertScale();
+	// Revert to base scale (returns true if the scale was actually changed by this call)
+	bool revertScale();
 
 	// TransformationChanged, apply the given scale to the "working copy"
 	void evaluateScale(const Vector3& scale);

radiantcore/model/StaticModelNode.cpp

@@ -234,9 +234,12 @@ void StaticModelNode::_onTransformationChanged()
     {
         // Transformation has been changed but no transform mode is set,
         // so the reason we got here is a cancelTransform() call, revert everything
-        _model->revertScale();
-        _model->evaluateScale(Vector3(1,1,1));
-        queueRenderableUpdate();
+        if (_model->revertScale())
+        {
+            // revertScale returned true, the scale has actually been modified
+            _model->evaluateScale(Vector3(1,1,1));
+            queueRenderableUpdate();
+        }
     }
 }