From 248d9809cabe483049fdc50f777a540180b4635b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 18 Mar 2021 14:25:23 +0100 Subject: Fix T86594: Overrides: Possible collection "duplication". Issue was actually in some Collection management code, a bit too eager to add collection to the scene master one when it was not actually needed. --- source/blender/blenkernel/intern/collection.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source') diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 4e4134c7c8f..178a762fd40 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -485,6 +485,11 @@ void BKE_collection_add_from_collection(Main *bmain, collection_child_add(collection, collection_dst, 0, true); is_instantiated = true; } + else if (!is_instantiated && collection_find_child(collection, collection_dst)) { + /* If given collection_dst is already instantiated in scene, even if its 'model' src one is + * not, do not add it to master scene collection. */ + is_instantiated = true; + } } FOREACH_SCENE_COLLECTION_END; -- cgit v1.2.3