#5231: Fix CreateSimplePatchMesh default keyboard binding and algorit…

…hm not executing due to a logic error.
codereader · Jun 28, 2020 · 7efa99a · 7efa99a
1 parent cceb7dc
commit 7efa99a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/install/input.xml b/install/input.xml
@@ -120,7 +120,7 @@
 		<shortcut command="PatchDeleteColumnEnd" key="KP_Subtract" modifiers="SHIFT+CONTROL" />
 		<shortcut command="PatchDeleteRowEnd" key="KP_Subtract" modifiers="CONTROL" />
 		<shortcut command="TextureNatural" key="N" modifiers="CONTROL" />
-		<shortcut command="CreateSimplePatchMesh" key="P" modifiers="SHIFT" />
+		<shortcut command="CreateSimplePatchDialog" key="P" modifiers="SHIFT" />
 		<shortcut command="InvertCurve" key="I" modifiers="CONTROL" />
 		<shortcut command="RedisperseRows" key="E" modifiers="CONTROL" />
 		<shortcut command="RedisperseCols" key="E" modifiers="SHIFT+CONTROL" />

diff --git a/install/menu.xml b/install/menu.xml
@@ -298,8 +298,8 @@
 		</subMenu>
 
 		<menuSeparator />
-		<menuItem name="thickenPatches" caption="Thicken Selected Patches" command="ThickenPatchDialog" />
-		<menuItem name="capselection" caption="Cap Selection" command="PatchCapDialog" icon="curve_cap.png" />
+		<menuItem name="thickenPatches" caption="Thicken Selected Patches..." command="ThickenPatchDialog" />
+		<menuItem name="capselection" caption="Cap Selection..." command="PatchCapDialog" icon="curve_cap.png" />
 		<menuSeparator />
 		<menuItem name="stitchTextures" caption="Stitch Patch Textures" command="StitchPatchTexture" />
     <menuItem name="bulgePatch" caption="Bulge Patch..." command="BulgePatchDialog" />

diff --git a/radiantcore/patch/algorithm/Prefab.cpp b/radiantcore/patch/algorithm/Prefab.cpp
@@ -226,7 +226,7 @@ void createSimplePatch(const cmd::ArgumentList& args)
 	}
 
 	// Only fire the dialog if no or invalid command arguments are given
-	if (width == 0 || height == 0)
+	if (width != 0 && height != 0)
 	{
 		UndoableCommand undo("patchCreatePlane");