blender
/
blender
134
400
Fork 584
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2021-03-18 14:25:23 +01:00
parent f75d690ee4
commit 248d9809ca
Notes: blender-bot 2023-02-13 19:15:09 +01:00 
Referenced by issue #86594, Overrides: Possible collection "duplication"
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/collection.c
View File

@ -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;