Commit: a73d902b0228d7532de09e40be36f25a02117bcf
Author: Antonio Vazquez
Date: Fri Mar 2 15:53:39 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa73d902b0228d7532de09e40be36f25a02117bcf
Fix again grease pencil modes after merge
===================================================================
M source/blender/editors/object/object_modes.c
===================================================================
diff --git a/source/blender/editors/object/object_modes.c
b/source/blender/editors/object/object_modes.c
index 5b2eeaff772..4272194152d 100644
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@ -176,7 +176,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);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
