#5725: Don't drag-create brushes in merge mode

codereader · Aug 29, 2021 · e55f547 · e55f547
1 parent e2cc8f7
commit e55f547
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/radiant/xyview/tools/BrushCreatorTool.cpp b/radiant/xyview/tools/BrushCreatorTool.cpp
@@ -29,9 +29,9 @@ MouseTool::Result BrushCreatorTool::onMouseDown(Event& ev)
 {
     try
     {
-        if (GlobalClipper().clipMode())
+        if (GlobalClipper().clipMode() || GlobalMapModule().getEditMode() == IMap::EditMode::Merge)
         {
-            return Result::Ignored; // no brush creation in clip mode
+            return Result::Ignored; // no brush creation in clip or merge mode
         }
 
         // We only operate on XY view events, so attempt to cast