diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-25 16:11:06 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-25 16:11:06 +0300 |
commit | e8eb67bb0400c674727d2c7b122f7fb08308dbdf (patch) | |
tree | 50cf92063ea3f5217c658e31b3bcfd41c6933a0c /source/blender/blenkernel/intern/blendfile_link_append.c | |
parent | b0d2a435a17540641c6f2fb7453db8fc560ca7f8 (diff) | |
parent | 841a354412c42f68e73793c43fc6db888cf58ce8 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile_link_append.c')
-rw-r--r-- | source/blender/blenkernel/intern/blendfile_link_append.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index e4b0f7bafa8..ebf48acde0f 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -1195,26 +1195,6 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList * .active_collection = NULL}; loose_data_instantiate(&instantiate_context); - /* Attempt to deal with object proxies. - * - * NOTE: Copied from `BKE_library_make_local`, but this is not really working (as in, not - * producing any useful result in any known use case), neither here nor in - * `BKE_library_make_local` currently. - * Proxies are end of life anyway, so not worth spending time on this. */ - for (itemlink = lapp_context->items.list; itemlink; itemlink = itemlink->next) { - BlendfileLinkAppendContextItem *item = itemlink->link; - - if (item->action != LINK_APPEND_ACT_COPY_LOCAL) { - continue; - } - - ID *id = item->new_id; - if (id == NULL) { - continue; - } - BLI_assert(!ID_IS_LINKED(id)); - } - BKE_main_id_newptr_and_tag_clear(bmain); blendfile_link_append_proxies_convert(bmain, reports); |