[Bf-blender-cvs] [08f15433ba1] blender2.8: GPencil: Cancel w/ RMB click

Campbell Barton noreply at git.blender.org
Tue Dec 18 03:36:20 CET 2018


Commit: 08f15433ba11c7beec64957f01f48c13471f8600
Author: Campbell Barton
Date:   Tue Dec 18 13:03:34 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB08f15433ba11c7beec64957f01f48c13471f8600

GPencil: Cancel w/ RMB click

RMB is used to cancel almost everywhere in blender, not confirm.

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 5c95dbf2a01..7faf399747b 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -1381,16 +1381,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
 			/* done! */
 			return OPERATOR_FINISHED;
 		}
-		case RIGHTMOUSE:
-		{
-			if (tgpi->flag == IN_CURVE_EDIT || (tgpi->flag == IN_PROGRESS && tgpi->tot_stored_edges > 0)) {
-				tgpi->flag = IDLE;
-				gpencil_primitive_interaction_end(C, op, win, tgpi);
-				/* done! */
-				return OPERATOR_FINISHED;
-			}
-			ATTR_FALLTHROUGH;
-		}
+		case RIGHTMOUSE: /* cancel */
 		case ESCKEY:
 		{
 			/* return to normal cursor and header status */



More information about the Bf-blender-cvs mailing list