Commit: 941a854674ef8f32bede0e25e9251c9d04377080
Author: Antonio Vazquez
Date: Tue Jun 6 09:49:24 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB941a854674ef8f32bede0e25e9251c9d04377080
Check mode status before change
===================================================================
M source/blender/editors/gpencil/gpencil_paint.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 37986a5a3ae..c55d0ca697d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2295,7 +2295,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator
*op, const wmEvent *event
if (p->sa->spacetype == SPACE_VIEW3D) {
Object *ob = CTX_data_active_object(C);
WorkSpace *workspace = CTX_wm_workspace(C);
- if (ob && (ob->type == OB_GPENCIL)) {
+ if (ob && (ob->type == OB_GPENCIL) && ((p->gpd->flag &
GP_DATA_STROKE_PAINTMODE) == 0)) {
/* Just set paintmode flag... */
p->gpd->flag |= GP_DATA_STROKE_PAINTMODE;
/* disable other GP modes */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
