Commit: 0a795fa99cdcef00e22da1ec2d1475c52f901ea5
Author: Antonioya
Date: Thu Dec 20 15:53:36 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0a795fa99cdcef00e22da1ec2d1475c52f901ea5
GP: Fix merge conflict
===================================================================
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 5dbd3312780..cda00a7171d 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -1455,11 +1455,10 @@ static int gpencil_primitive_modal(bContext *C,
wmOperator *op, const wmEvent *e
gpencil_primitive_update(C, op, tgpi);
break;
case ESCKEY:
- case LEFTMOUSE:
+ case RIGHTMOUSE:
zero_v2(tgpi->move);
tgpi->flag = IN_CURVE_EDIT;
break;
- case RIGHTMOUSE:
case LEFTMOUSE:
tgpi->flag = IN_CURVE_EDIT;
break;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
