#401: disable "Create Decal Patches" if no faces selected

codereader · Jul 27, 2022 · fc7807d · fc7807d
1 parent 4c3a5d6
commit fc7807d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/radiantcore/selection/algorithm/General.cpp b/radiantcore/selection/algorithm/General.cpp
@@ -1005,9 +1005,12 @@ void registerCommands()
 
 	GlobalCommandSystem().addCommand("ExportSelectedAsCollisionModel", createCMFromSelection, { cmd::ARGTYPE_STRING });
 
-	GlobalCommandSystem().addCommand("CreateDecalsForFaces", createDecalsForSelectedFaces);
+    GlobalCommandSystem().addWithCheck(
+        "CreateDecalsForFaces", [](const cmd::ArgumentList&) { createDecalsForSelectedFaces(); },
+        [] { return !FaceInstance::Selection().empty(); }
+    );
 
-	GlobalCommandSystem().addCommand("Copy", clipboard::copy);
+    GlobalCommandSystem().addCommand("Copy", clipboard::copy);
 	GlobalCommandSystem().addCommand("Cut", clipboard::cut);
 	GlobalCommandSystem().addCommand("Paste", clipboard::paste);
 	GlobalCommandSystem().addCommand("PasteToCamera", clipboard::pasteToCamera);

diff --git a/radiantcore/selection/algorithm/Primitives.cpp b/radiantcore/selection/algorithm/Primitives.cpp
@@ -347,7 +347,7 @@ class DecalPatchCreator
 	}
 };
 
-void createDecalsForSelectedFaces(const cmd::ArgumentList& args)
+void createDecalsForSelectedFaces()
 {
 	// Sanity check
 	if (FaceInstance::Selection().empty())

diff --git a/radiantcore/selection/algorithm/Primitives.h b/radiantcore/selection/algorithm/Primitives.h
@@ -81,7 +81,7 @@ namespace selection {
 
 	/** greebo: Creates a coplanar patch for each selected face instance.
 	 */
-	void createDecalsForSelectedFaces(const cmd::ArgumentList& args);
+	void createDecalsForSelectedFaces();
 
 	/**
 	 * greebo: Applies the visportal/nodraw texture combo to the selected brushes.