[Bf-blender-cvs] [a057e55981d] greasepencil-object: Fix grease pencil mode problems after merge

[Antonio Vazquez]

Commit: a057e55981da9af707c1ffa412b7f7ed3cd8e404
Author: Antonio Vazquez
Date:   Wed Feb 28 20:03:12 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa057e55981da9af707c1ffa412b7f7ed3cd8e404

Fix grease pencil mode problems after merge

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

M	source/blender/editors/object/object_edit.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 6cfc77cb7cf..10846fe0919 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2135,7 +2135,8 @@ bool ED_object_mode_generic_enter(
         struct bContext *C, eObjectMode object_mode)
 {
 	WorkSpace *workspace = CTX_wm_workspace(C);
-	if (workspace->object_mode == object_mode) {
+	Object *ob = CTX_data_active_object(C);
+	if ((workspace->object_mode == object_mode) && (!(ob) || (ob->type != OB_GPENCIL))) {
 		return true;
 	}
 	wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_mode_set", false);