blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Append: Fix appended objects potentially auto-instantiated in more than one collection. 

Related to T87189.
This commit is contained in:
Bastien Montagne 2021-10-01 12:13:29 +02:00
parent af0b7925db
commit 928d644895
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenloader/intern/readfile.c
View File

@ -4506,7 +4506,10 @@ static void add_loose_objects_to_scene(Main *mainvar,
/* Give all objects which are LIB_TAG_INDIRECT a base,
* or for a collection when *lib has been set. */
LISTBASE_FOREACH (Object *, ob, &mainvar->objects) {
bool do_it = (ob->id.tag & LIB_TAG_DOIT) != 0;
/* NOTE: Even if this is a directly linked object and is tagged for instantiation, it might
* have already been instantiated through one of its owner collections, in which case we do not
* want to re-instantiate it in the active collection here. */
bool do_it = (ob->id.tag & LIB_TAG_DOIT) != 0 && !BKE_scene_object_find(scene, ob);
if (do_it ||
((ob->id.tag & LIB_TAG_INDIRECT) != 0 && (ob->id.tag & LIB_TAG_PRE_EXISTING) == 0)) {
if (do_append) {