From 4d944c5491cd4e1e10fc4dc0ece6f54cd3f49eda Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 16 May 2024 16:22:47 +0200 Subject: [PATCH] Link/Append: Remove a deprecated hack to handle liboverrides. Code used to tag liboverrides references as 'pre-existing' to force code further down the way to always keep these IDs linked. However, this was a (bad) hack, since it could have uncontrollable side-effects, abusing a tag for somethig else than its original meaning. And this should not have been needed for quite some time already, as liboverrides handling was already properly done by append post-processing code. No behavior change expected here. --- .../blender/blenkernel/intern/blendfile_link_append.cc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 364f9bc84af..a219b333859 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -957,15 +957,6 @@ static void new_id_to_item_mapping_add(BlendfileLinkAppendContext *lapp_context, BlendfileLinkAppendContextItem *item) { BLI_ghash_insert(lapp_context->new_id_to_item, id, item); - - /* This ensures that if a liboverride reference is also linked/used by some other appended - * data, it gets a local copy instead of being made directly local, so that the liboverride - * references remain valid (i.e. linked data). */ - /* FIXME: This is a hack, and it should not be needed anymore, as liboverrides are supposed to be - * properly handled as part of the 'append' code (see #BKE_blendfile_append and related). */ - if (ID_IS_OVERRIDE_LIBRARY_REAL(id)) { - id->override_library->reference->tag |= LIB_TAG_PRE_EXISTING; - } } /* Generate a mapping between newly linked IDs and their items, and tag linked IDs used as