[Bf-blender-cvs] [841a354412c] blender-v3.2-release: Cleanup: Link/append: Remove useless proxy handling code.
Bastien Montagne
noreply at git.blender.org
Wed May 25 15:10:50 CEST 2022
Commit: 841a354412c42f68e73793c43fc6db888cf58ce8
Author: Bastien Montagne
Date: Wed May 25 15:09:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB841a354412c42f68e73793c43fc6db888cf58ce8
Cleanup: Link/append: Remove useless proxy handling code.
This was not effectively doing anything anymore, time to remove it.
===================================================================
M source/blender/blenkernel/intern/blendfile_link_append.c
===================================================================
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index 92b3abd5af5..62196ea63bd 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);
More information about the Bf-blender-cvs
mailing list