From 7aeb24e037112c6b8a20d658c3f5c33b1e51e821 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Dec 2018 10:22:42 +1100 Subject: Fix multi-object state on load D4091 by @zazizizou --- source/blender/editors/util/ed_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 d2bed9ca06e..b3ec0a4388f 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -122,7 +122,7 @@ void ED_editors_init(bContext *C) 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))) { + if ((ob->type == obact->type) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) { if (mode == OB_MODE_EDIT) { ED_object_editmode_enter_ex(bmain, scene, ob, 0); } -- cgit v1.2.3