[Bf-blender-cvs] [c4a24a7f5da] blender2.8: Tool System: inset tool now completes on release

Campbell Barton noreply at git.blender.org
Fri Apr 27 20:38:37 CEST 2018


Commit: c4a24a7f5dab6c3f26bde984676b384fce0e0ded
Author: Campbell Barton
Date:   Fri Apr 27 20:37:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc4a24a7f5dab6c3f26bde984676b384fce0e0ded

Tool System: inset tool now completes on release

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	source/blender/editors/mesh/editmesh_inset.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index e2e002dd7be..d827fef132c 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -257,7 +257,7 @@ class _defs_edit_mesh:
         icon = "ops.mesh.inset"
         widget = None
         keymap = (
-            ("mesh.inset", dict(),
+            ("mesh.inset", dict(release_confirm=True),
              dict(type='ACTIONMOUSE', value='PRESS')),
         )
 
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 53ba5e4316f..58bd1dbd488 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -378,7 +378,9 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			case LEFTMOUSE:
 			case PADENTER:
 			case RETKEY:
-				if (event->val == KM_PRESS) {
+				if ((event->val == KM_PRESS) ||
+				    ((event->val == KM_RELEASE) && RNA_boolean_get(op->ptr, "release_confirm")))
+				{
 					edbm_inset_calc(op);
 					edbm_inset_exit(C, op);
 					return OPERATOR_FINISHED;
@@ -540,4 +542,7 @@ void MESH_OT_inset(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "use_select_inset", false, "Select Outer", "Select the new inset faces");
 	RNA_def_boolean(ot->srna, "use_individual", false, "Individual", "Individual Face Inset");
 	RNA_def_boolean(ot->srna, "use_interpolate", true, "Interpolate", "Blend face data across the inset");
+
+	prop = RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "");
+	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }



More information about the Bf-blender-cvs mailing list