#4846: Fix the manipulation pivot being stuck in a position when the …

…user cancels the move, preventing it from recalculating its position on selection change or even changing the manipulator.

radiantcore/selection/ManipulationPivot.cpp

@@ -96,6 +96,12 @@ void ManipulationPivot::endOperation()
 	_operationActive = false;
 }
 
+void ManipulationPivot::cancelOperation()
+{
+    revertToStart();
+    _operationActive = false;
+}
+
 void ManipulationPivot::applyTranslation(const Vector3& translation)
 {
 	// We apply translations on top of the starting point

radiantcore/selection/ManipulationPivot.h

@@ -76,6 +76,9 @@ class ManipulationPivot
 
 	void endOperation();
 
+    // Operation cancelled, this reverts the pivot to where we started
+    void cancelOperation();
+
 	void applyTranslation(const Vector3& translation);
 
 	// Rescans the selection and calculates the pivot afresh,

radiantcore/selection/RadiantSelectionSystem.cpp

@@ -853,6 +853,8 @@ void RadiantSelectionSystem::onManipulationCancelled()
         GlobalSceneGraph().root()->traverse(faceSelector);
     }
 
+    _pivot.cancelOperation();
+
     pivotChanged();
 }
 
@@ -861,7 +863,6 @@ void RadiantSelectionSystem::renderWireframe(RenderableCollector& collector, con
     renderSolid(collector, volume);
 }
 
-// Lets the recalculatePivot2World() method do the work and returns the result that is stored in the member variable
 const Matrix4& RadiantSelectionSystem::getPivot2World()
 {
     return _pivot.getMatrix4();