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
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-02-24 16:14:46 +0300
committerBastien Montagne <bastien@blender.org>2021-02-24 16:14:46 +0300
commit8f6fd07b54653befe9568cca2752603c74ab5667 (patch)
tree82f4ffbc8b0e78d99a483fca0b1c6df0865aede9
parent0c0553ace7b31107ba03952e013d802a5f6b1f35 (diff)
Fix T85947: Missing check of master collection for objects being instanced.
`object_in_any_collection` used during linking/appending to check whether an object is already instanced by at least one collection, was not taking into account embedded master collections from scenes.
-rw-r--r--source/blender/blenloader/intern/readfile.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6528e1cdf79..bea05699579 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4600,6 +4600,13 @@ static bool object_in_any_collection(Main *bmain, Object *ob)
}
}
+ LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+ if (scene->master_collection != NULL &&
+ BKE_collection_has_object(scene->master_collection, ob)) {
+ return true;
+ }
+ }
+
return false;
}