From de994d6b7b1c8789ee2797b8138c2fb115370b9c Mon Sep 17 00:00:00 2001 From: Antonioya Date: Thu, 20 Sep 2018 13:47:59 +0200 Subject: GP: Fix problem with mode opening 2D Animation template The grease pencil does not need a toggle of mode. This fix also the problem when open grease pencil files that did not keep the mode saved. --- source/blender/editors/util/ed_util.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/util/ed_util.c') diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 30c1606e3d8..10698b9ebab 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -115,11 +115,15 @@ void ED_editors_init(bContext *C) /* pass */ } else if (!BKE_object_has_mode_data(ob, mode)) { - /* For multi-edit mode we may already have mode data. */ - ID *data = ob->data; - ob->mode = OB_MODE_OBJECT; - if ((ob == obact) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) { - ED_object_mode_toggle(C, mode); + /* For multi-edit mode we may already have mode data. + * (grease pencil does not need it) + */ + if (ob->type != OB_GPENCIL) { + ID *data = ob->data; + ob->mode = OB_MODE_OBJECT; + if ((ob == obact) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) { + ED_object_mode_toggle(C, mode); + } } } } -- cgit v1.2.3