#5356: Leave the third coordinate of a clipper point untouched when m…

…oving it in orthographic views
codereader · Oct 13, 2020 · 0934ed2 · 0934ed2
1 parent 81f3030
commit 0934ed2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/radiant/xyview/tools/ClipperTool.cpp b/radiant/xyview/tools/ClipperTool.cpp
@@ -76,10 +76,19 @@ MouseTool::Result ClipperTool::onMouseMove(Event& ev)
         }
 
         // Check, if we have a clip point operation running
-        if (GlobalClipper().getMovingClip() != NULL)
+        if (GlobalClipper().getMovingClip() != nullptr)
         {
-            GlobalClipper().getMovingClipCoords() = xyEvent.getWorldPos();
-            xyEvent.getView().snapToGrid(GlobalClipper().getMovingClipCoords());
+            // Leave the third coordinate of the clip point untouched (#5356)
+            auto viewType = xyEvent.getViewType();
+            int missingDim = viewType == XY ? 2 : viewType == YZ ? 0 : 1;
+            auto& clipCoords = GlobalClipper().getMovingClipCoords();
+
+            Vector3 newWorldPos = xyEvent.getWorldPos();
+            newWorldPos[missingDim] = clipCoords[missingDim];
+
+            xyEvent.getView().snapToGrid(newWorldPos);
+
+            GlobalClipper().getMovingClipCoords() = newWorldPos;
             GlobalClipper().update();
 
             GlobalMainFrame().updateAllWindows();