[Bf-blender-cvs] [293c15ec0cc] blender2.8: Fix T56081: crash with make static override and linked collection.

Brecht Van Lommel noreply at git.blender.org
Tue Jul 24 12:03:02 CEST 2018


Commit: 293c15ec0cc3878bced1b52e274c078810ba2d8a
Author: Brecht Van Lommel
Date:   Tue Jul 24 12:02:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB293c15ec0cc3878bced1b52e274c078810ba2d8a

Fix T56081: crash with make static override and linked collection.

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

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

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

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 2c3ff8b6afe..52d9c43ea65 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2329,6 +2329,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op)
 			if (new_ob != NULL && new_ob->id.override_static != NULL) {
 				if ((base = BKE_view_layer_base_find(view_layer, new_ob)) == NULL) {
 					BKE_collection_object_add_from(bmain, scene, obcollection, new_ob);
+					base = BKE_view_layer_base_find(view_layer, new_ob);
 					DEG_id_tag_update_ex(bmain, &new_ob->id, DEG_TAG_TRANSFORM | DEG_TAG_BASE_FLAGS_UPDATE);
 				}
 				/* parent to 'collection' empty */



More information about the Bf-blender-cvs mailing list