#6095: Make Detail and Make Structural disabled without selection

codereader · Sep 7, 2022 · db43447 · db43447
1 parent 197b34b
commit db43447
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/radiantcore/selection/algorithm/General.cpp b/radiantcore/selection/algorithm/General.cpp
@@ -1025,13 +1025,17 @@ void registerCommands()
     GlobalCommandSystem().addCommand("CreateCurveNURBS", createCurveNURBS);
     GlobalCommandSystem().addCommand("CreateCurveCatmullRom", createCurveCatmullRom);
 
-	GlobalCommandSystem().addCommand("FloorSelection", floorSelection);
-	GlobalCommandSystem().addCommand("BrushSetDetailFlag", brushSetDetailFlag, { cmd::ARGTYPE_STRING });
-	GlobalCommandSystem().addStatement("BrushMakeDetail", "BrushSetDetailFlag detail", false);
-	GlobalCommandSystem().addStatement("BrushMakeStructural", "BrushSetDetailFlag structural", false);
-
-	GlobalCommandSystem().addCommand(scene::SELECT_NODE_BY_INDEX_CMD, scene::selectNodeByIndexCmd,
-		{ cmd::ARGTYPE_INT, cmd::ARGTYPE_INT });
+    GlobalCommandSystem().addCommand("FloorSelection", floorSelection);
+    GlobalCommandSystem().addWithCheck("BrushSetDetailFlag", brushSetDetailFlag,
+                                       [] { return selection::pred::haveBrush(); },
+                                       {cmd::ARGTYPE_STRING});
+    GlobalCommandSystem().addStatement("BrushMakeDetail", "BrushSetDetailFlag detail",
+                                       false);
+    GlobalCommandSystem().addStatement("BrushMakeStructural", "BrushSetDetailFlag structural",
+                                       false);
+
+    GlobalCommandSystem().addCommand(scene::SELECT_NODE_BY_INDEX_CMD, scene::selectNodeByIndexCmd,
+                                     {cmd::ARGTYPE_INT, cmd::ARGTYPE_INT});
 }
 
 	} // namespace algorithm