[Bf-blender-cvs] [4509559] master: Fix modal bevel OP immediately stopping when called using enter key from search menu

Julian Eisel noreply at git.blender.org
Fri Mar 25 12:36:41 CET 2016


Commit: 4509559c1318fb60e62dd8b9e6b702b44b398e20
Author: Julian Eisel
Date:   Fri Mar 25 12:21:54 2016 +0100
Branches: master
https://developer.blender.org/rB4509559c1318fb60e62dd8b9e6b702b44b398e20

Fix modal bevel OP immediately stopping when called using enter key from search menu

Steps to reproduce were:
* Go to edit mode, select geometry
* Spacebar -> search for bevel OP
* Activate *using enter key*
* Immediately stops when releasing enter key

To fix we simply make sure the initial release event is ignored. For mouse events that wasn't an issue since activating an element is done on key release in menus. An alternative fix would be to do the same for enter key, but that's more risky. Also, checking event value is highly recommended anyway.

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

M	source/blender/editors/mesh/editmesh_bevel.c

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

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index d640766..847a7b5 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -361,9 +361,12 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			case LEFTMOUSE:
 			case PADENTER:
 			case RETKEY:
-				edbm_bevel_calc(op);
-				edbm_bevel_exit(C, op);
-				return OPERATOR_FINISHED;
+				if (event->val == KM_PRESS) {
+					edbm_bevel_calc(op);
+					edbm_bevel_exit(C, op);
+					return OPERATOR_FINISHED;
+				}
+				break;
 
 			/* Note this will prevent padplus and padminus to ever activate modal numinput.
 			 * This is not really an issue though, as we only expect positive values here...




More information about the Bf-blender-cvs mailing list