From 8f6fd07b54653befe9568cca2752603c74ab5667 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 24 Feb 2021 14:14:46 +0100 Subject: 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. --- source/blender/blenloader/intern/readfile.c | 7 +++++++ 1 file changed, 7 insertions(+) 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; } -- cgit v1.2.3