Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-24 13:02:24 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-24 13:02:24 +0300
commit293c15ec0cc3878bced1b52e274c078810ba2d8a (patch)
treee4faae9a1f5bf74d2e5f3c9e6a6f8810c6d33611 /source
parent882ccd924ba9febaec2db53831d95bc4a6c45ef3 (diff)
Fix T56081: crash with make static override and linked collection.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_relations.c1
1 files changed, 1 insertions, 0 deletions
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 */