[Bf-blender-cvs] [61b6eb6] GPencil_Editing_Stage3: GPencil EditMode: Only sync editmode with ob->mode in 3D view

Joshua Leung noreply at git.blender.org
Sat Sep 19 14:10:50 CEST 2015


Commit: 61b6eb606cf04454283eca53033e085eceb5150f
Author: Joshua Leung
Date:   Sat Sep 19 19:39:21 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB61b6eb606cf04454283eca53033e085eceb5150f

GPencil EditMode: Only sync editmode with ob->mode in 3D view

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 32f5c9c4..080de3a 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -83,6 +83,7 @@ static int gpencil_editmode_toggle_poll(bContext *C)
 
 static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
+	ScrArea *sa = CTX_wm_area(C);
 	Object *ob = CTX_data_active_object(C);
 	bGPdata *gpd = ED_gpencil_data_get_active(C);
 	
@@ -96,8 +97,12 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 	
 	/* Update active object's mode setting,
 	 * as it now needs to reflect GPencil status...
+	 *
+	 * NOTE: Since Grease Pencil can be used in various editors,
+	 * we will only do this in the 3D view, where the ob->mode
+	 * gets shown.
 	 */
-	if (ob) {
+	if ((sa->spacetype == SPACE_VIEW3D) && (ob != NULL)) {
 		ob->restore_mode = ob->mode;
 		
 		if (gpd->flag & GP_DATA_STROKE_EDITMODE) {




More information about the Bf-blender-cvs mailing list