[Bf-blender-cvs] [7e99bab] GPencil_Editing_Stage3: GPencil Sculpt: MMB can now be used for viewport manipulations while the sculpt operator is active

Joshua Leung noreply at git.blender.org
Fri Jul 10 14:39:01 CEST 2015


Commit: 7e99bab425410a32a7d7443ba39d0fb2cb71e985
Author: Joshua Leung
Date:   Tue Jul 7 22:45:26 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB7e99bab425410a32a7d7443ba39d0fb2cb71e985

GPencil Sculpt: MMB can now be used for viewport manipulations while the sculpt operator is active

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

M	source/blender/editors/gpencil/gpencil_brush.c

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

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 40eea22..ef39db9 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -748,12 +748,15 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 				
 			/* Exit modal operator, based on the "standard" ops */
 			// XXX: should this be "emergency stop" instead? (i.e. operator_cancelled)
-			case MIDDLEMOUSE:
 			case RIGHTMOUSE:
 			case ESCKEY:
 				gpsculpt_brush_exit(C, op);
 				return OPERATOR_FINISHED;
 				
+			/* MMB is often used for view manipulations */
+			case MIDDLEMOUSE:
+				return OPERATOR_PASS_THROUGH;
+				
 			/* Mouse movements should update the brush cursor - Just redraw the active region */
 			case MOUSEMOVE:
 			case INBETWEEN_MOUSEMOVE:




More information about the Bf-blender-cvs mailing list