[Bf-blender-cvs] [327bb6e5434] master: Fix ruler access from search pop-up

Campbell Barton noreply at git.blender.org
Fri Oct 6 08:19:30 CEST 2017


Commit: 327bb6e54349226fcf99d5b5fc77308b3d575b4e
Author: Campbell Barton
Date:   Fri Oct 6 17:12:25 2017 +1100
Branches: master
https://developer.blender.org/rB327bb6e54349226fcf99d5b5fc77308b3d575b4e

Fix ruler access from search pop-up

D2831 by @1xundoredo

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

M	source/blender/editors/space_view3d/view3d_ruler.c

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

diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index 714db0db0ff..f2c87953302 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -1008,9 +1008,12 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event)
 		}
 		case RETKEY:
 		{
-			view3d_ruler_to_gpencil(C, ruler_info);
-			do_draw = true;
-			exit_code = OPERATOR_FINISHED;
+			/* Enter may be used to invoke from search. */
+			if (event->val == KM_PRESS) {
+				view3d_ruler_to_gpencil(C, ruler_info);
+				do_draw = true;
+				exit_code = OPERATOR_FINISHED;
+			}
 			break;
 		}
 		case DELKEY:



More information about the Bf-blender-cvs mailing list