[Bf-blender-cvs] [7aeb24e0371] blender2.8: Fix multi-object state on load

Campbell Barton noreply at git.blender.org
Tue Dec 18 00:23:42 CET 2018


Commit: 7aeb24e037112c6b8a20d658c3f5c33b1e51e821
Author: Campbell Barton
Date:   Tue Dec 18 10:22:42 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB7aeb24e037112c6b8a20d658c3f5c33b1e51e821

Fix multi-object state on load

D4091 by @zazizizou

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

M	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);
 						}



More information about the Bf-blender-cvs mailing list