blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Fix T93402: Linking Collections instantiate extra sub-collections. 

Linking is more relax than appending when it comes to instantiating
indirectly linked collections/objects.
This commit is contained in:
Bastien Montagne 2021-11-26 17:47:42 +01:00
parent 0789f61373
commit 2efc2221cc
Notes: blender-bot 2023-02-14 02:27:56 +01:00 
Referenced by issue #93402, Linking Collections links additional objects
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/blendfile_link_append.c
View File

@ -579,6 +579,8 @@ static void loose_data_instantiate_collection_process(
ViewLayer *view_layer = lapp_context->params->context.view_layer;
const View3D *v3d = lapp_context->params->context.v3d;
const bool do_append = (lapp_context->params->flag & FILE_LINK) == 0;
/* NOTE: For collections we only view_layer-instantiate duplicated collections that have
* non-instantiated objects in them. */
LinkNode *itemlink;
@ -601,7 +603,10 @@ static void loose_data_instantiate_collection_process(
Collection *collection = (Collection *)id;
/* We always add collections directly selected by the user. */
bool do_add_collection = (item->tag & LINK_APPEND_TAG_INDIRECT) == 0;
if (!do_add_collection) {
/* In linking case, we do not enforce instantiating non-directly linked collections/objects.
* This avoids cluttering the ViewLayers, user can instantiate themselves specific collections
* or objects easily from the Outliner if needed. */
if (!do_add_collection && do_append) {
LISTBASE_FOREACH (CollectionObject *, coll_ob, &collection->gobject) {
Object *ob = coll_ob->ob;
if (!object_in_any_scene(bmain, ob)) {