Fixes for changes in master

8 files changed, 19 insertions, 1929 deletions

diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 7c96d0a6401..6fce898fd1e 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -61,6 +61,8 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user)
   }
 
   BKE_animdata_free(id, do_id_user);
+
+  MEM_SAFE_FREE(id->uuid);
 }
 
 void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag))
diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c
index bc009c80849..3026dd617b5 100644
--- a/source/blender/blenkernel/intern/lib_remap.c
+++ b/source/blender/blenkernel/intern/lib_remap.c
@@ -29,6 +29,7 @@
 #include "BKE_armature.h"
 #include "BKE_collection.h"
 #include "BKE_curve.h"
+#include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
@@ -691,433 +692,3 @@ void BKE_libblock_relink_to_newid(ID *id)
 
   BKE_library_foreach_ID_link(NULL, id, id_relink_to_newid_looper, NULL, 0);
 }
-
-void BKE_libblock_free_data(ID *id, const bool do_id_user)
-{
-  if (id->properties) {
-    IDP_FreePropertyContent_ex(id->properties, do_id_user);
-    MEM_freeN(id->properties);
-  }
-
-  if (id->override_library) {
-    BKE_override_library_free(&id->override_library, do_id_user);
-  }
-
-  /* XXX TODO remove animdata handling from each type's freeing func,
-   * and do it here, like for copy! */
-}
-
-void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag))
-{
-  const short type = GS(id->name);
-  switch (type) {
-    case ID_SCE:
-      BKE_scene_free_ex((Scene *)id, false);
-      break;
-    case ID_LI:
-      BKE_library_free((Library *)id);
-      break;
-    case ID_OB:
-      BKE_object_free((Object *)id);
-      break;
-    case ID_ME:
-      BKE_mesh_free((Mesh *)id);
-      break;
-    case ID_CU:
-      BKE_curve_free((Curve *)id);
-      break;
-    case ID_MB:
-      BKE_mball_free((MetaBall *)id);
-      break;
-    case ID_MA:
-      BKE_material_free((Material *)id);
-      break;
-    case ID_TE:
-      BKE_texture_free((Tex *)id);
-      break;
-    case ID_IM:
-      BKE_image_free((Image *)id);
-      break;
-    case ID_LT:
-      BKE_lattice_free((Lattice *)id);
-      break;
-    case ID_LA:
-      BKE_light_free((Light *)id);
-      break;
-    case ID_CA:
-      BKE_camera_free((Camera *)id);
-      break;
-    case ID_IP: /* Deprecated. */
-      BKE_ipo_free((Ipo *)id);
-      break;
-    case ID_KE:
-      BKE_key_free((Key *)id);
-      break;
-    case ID_WO:
-      BKE_world_free((World *)id);
-      break;
-    case ID_SCR:
-      BKE_screen_free((bScreen *)id);
-      break;
-    case ID_VF:
-      BKE_vfont_free((VFont *)id);
-      break;
-    case ID_TXT:
-      BKE_text_free((Text *)id);
-      break;
-    case ID_SPK:
-      BKE_speaker_free((Speaker *)id);
-      break;
-    case ID_LP:
-      BKE_lightprobe_free((LightProbe *)id);
-      break;
-    case ID_SO:
-      BKE_sound_free((bSound *)id);
-      break;
-    case ID_GR:
-      BKE_collection_free((Collection *)id);
-      break;
-    case ID_AR:
-      BKE_armature_free((bArmature *)id);
-      break;
-    case ID_AC:
-      BKE_action_free((bAction *)id);
-      break;
-    case ID_NT:
-      ntreeFreeTree((bNodeTree *)id);
-      break;
-    case ID_BR:
-      BKE_brush_free((Brush *)id);
-      break;
-    case ID_PA:
-      BKE_particlesettings_free((ParticleSettings *)id);
-      break;
-    case ID_WM:
-      if (free_windowmanager_cb) {
-        free_windowmanager_cb(NULL, (wmWindowManager *)id);
-      }
-      break;
-    case ID_GD:
-      BKE_gpencil_free((bGPdata *)id, true);
-      break;
-    case ID_MC:
-      BKE_movieclip_free((MovieClip *)id);
-      break;
-    case ID_MSK:
-      BKE_mask_free((Mask *)id);
-      break;
-    case ID_LS:
-      BKE_linestyle_free((FreestyleLineStyle *)id);
-      break;
-    case ID_PAL:
-      BKE_palette_free((Palette *)id);
-      break;
-    case ID_PC:
-      BKE_paint_curve_free((PaintCurve *)id);
-      break;
-    case ID_CF:
-      BKE_cachefile_free((CacheFile *)id);
-      break;
-    case ID_WS:
-      BKE_workspace_free((WorkSpace *)id);
-      break;
-  }
-}
-
-/**
- * Complete ID freeing, extended version for corner cases.
- * Can override default (and safe!) freeing process, to gain some speed up.
- *
- * At that point, given id is assumed to not be used by any other data-block already
- * (might not be actually true, in case e.g. several inter-related IDs get freed together...).
- * However, they might still be using (referencing) other IDs, this code takes care of it if
- * #LIB_TAG_NO_USER_REFCOUNT is not defined.
- *
- * \param bmain: #Main database containing the freed #ID,
- * can be NULL in case it's a temp ID outside of any #Main.
- * \param idv: Pointer to ID to be freed.
- * \param flag: Set of \a LIB_ID_FREE_... flags controlling/overriding usual freeing process,
- * 0 to get default safe behavior.
- * \param use_flag_from_idtag: Still use freeing info flags from given #ID datablock,
- * even if some overriding ones are passed in \a flag parameter.
- */
-void BKE_id_free_ex(Main *bmain, void *idv, int flag, const bool use_flag_from_idtag)
-{
-  ID *id = idv;
-
-  if (use_flag_from_idtag) {
-    if ((id->tag & LIB_TAG_NO_MAIN) != 0) {
-      flag |= LIB_ID_FREE_NO_MAIN | LIB_ID_FREE_NO_UI_USER | LIB_ID_FREE_NO_DEG_TAG;
-    }
-    else {
-      flag &= ~LIB_ID_FREE_NO_MAIN;
-    }
-
-    if ((id->tag & LIB_TAG_NO_USER_REFCOUNT) != 0) {
-      flag |= LIB_ID_FREE_NO_USER_REFCOUNT;
-    }
-    else {
-      flag &= ~LIB_ID_FREE_NO_USER_REFCOUNT;
-    }
-
-    if ((id->tag & LIB_TAG_NOT_ALLOCATED) != 0) {
-      flag |= LIB_ID_FREE_NOT_ALLOCATED;
-    }
-    else {
-      flag &= ~LIB_ID_FREE_NOT_ALLOCATED;
-    }
-  }
-
-  BLI_assert((flag & LIB_ID_FREE_NO_MAIN) != 0 || bmain != NULL);
-  BLI_assert((flag & LIB_ID_FREE_NO_MAIN) != 0 || (flag & LIB_ID_FREE_NOT_ALLOCATED) == 0);
-  BLI_assert((flag & LIB_ID_FREE_NO_MAIN) != 0 || (flag & LIB_ID_FREE_NO_USER_REFCOUNT) == 0);
-
-  const short type = GS(id->name);
-
-  if (bmain && (flag & LIB_ID_FREE_NO_DEG_TAG) == 0) {
-    DEG_id_type_tag(bmain, type);
-  }
-
-#ifdef WITH_PYTHON
-#  ifdef WITH_PYTHON_SAFETY
-  BPY_id_release(id);
-#  endif
-  if (id->py_instance) {
-    BPY_DECREF_RNA_INVALIDATE(id->py_instance);
-  }
-#endif
-
-  if ((flag & LIB_ID_FREE_NO_USER_REFCOUNT) == 0) {
-    BKE_libblock_relink_ex(bmain, id, NULL, NULL, 0);
-  }
-
-  BKE_libblock_free_datablock(id, flag);
-
-  /* avoid notifying on removed data */
-  if ((flag & LIB_ID_FREE_NO_MAIN) == 0) {
-    BKE_main_lock(bmain);
-  }
-
-  if ((flag & LIB_ID_FREE_NO_UI_USER) == 0) {
-    if (free_notifier_reference_cb) {
-      free_notifier_reference_cb(id);
-    }
-
-    if (remap_editor_id_reference_cb) {
-      remap_editor_id_reference_cb(id, NULL);
-    }
-  }
-
-  if ((flag & LIB_ID_FREE_NO_MAIN) == 0) {
-    ListBase *lb = which_libbase(bmain, type);
-    BLI_remlink(lb, id);
-  }
-
-  BKE_libblock_free_data(id, (flag & LIB_ID_FREE_NO_USER_REFCOUNT) == 0);
-
-  if ((flag & LIB_ID_FREE_NO_MAIN) == 0) {
-    BKE_main_unlock(bmain);
-  }
-
-  if ((flag & LIB_ID_FREE_NOT_ALLOCATED) == 0) {
-    MEM_freeN(id);
-  }
-}
-
-/**
- * Complete ID freeing, should be usable in most cases (even for out-of-Main IDs).
- *
- * See #BKE_id_free_ex description for full details.
- *
- * \param bmain: Main database containing the freed ID,
- * can be NULL in case it's a temp ID outside of any Main.
- * \param idv: Pointer to ID to be freed.
- */
-void BKE_id_free(Main *bmain, void *idv)
-{
-  BKE_id_free_ex(bmain, idv, 0, true);
-}
-
-/**
- * Not really a freeing function by itself,
- * it decrements usercount of given id, and only frees it if it reaches 0.
- */
-void BKE_id_free_us(Main *bmain, void *idv) /* test users */
-{
-  ID *id = idv;
-
-  id_us_min(id);
-
-  /* XXX This is a temp (2.77) hack so that we keep same behavior as in 2.76 regarding collections
-   *     when deleting an object. Since only 'user_one' usage of objects is collections,
-   *     and only 'real user' usage of objects is scenes, removing that 'user_one' tag when there
-   *     is no more real (scene) users of an object ensures it gets fully unlinked.
-   *     But only for local objects, not linked ones!
-   *     Otherwise, there is no real way to get rid of an object anymore -
-   *     better handling of this is TODO.
-   */
-  if ((GS(id->name) == ID_OB) && (id->us == 1) && (id->lib == NULL)) {
-    id_us_clear_real(id);
-  }
-
-  if (id->us == 0) {
-    BKE_libblock_unlink(bmain, id, false, false);
-
-    BKE_id_free(bmain, id);
-  }
-}
-
-static void id_delete(Main *bmain, const bool do_tagged_deletion)
-{
-  const int tag = LIB_TAG_DOIT;
-  ListBase *lbarray[MAX_LIBARRAY];
-  Link dummy_link = {0};
-  int base_count, i;
-
-  /* Used by batch tagged deletion, when we call BKE_id_free then, id is no more in Main database,
-   * and has already properly unlinked its other IDs usages.
-   * UI users are always cleared in BKE_libblock_remap_locked() call, so we can always skip it. */
-  const int free_flag = LIB_ID_FREE_NO_UI_USER |
-                        (do_tagged_deletion ? LIB_ID_FREE_NO_MAIN | LIB_ID_FREE_NO_USER_REFCOUNT :
-                                              0);
-  ListBase tagged_deleted_ids = {NULL};
-
-  base_count = set_listbasepointers(bmain, lbarray);
-
-  BKE_main_lock(bmain);
-  if (do_tagged_deletion) {
-    /* Main idea of batch deletion is to remove all IDs to be deleted from Main database.
-     * This means that we won't have to loop over all deleted IDs to remove usages
-     * of other deleted IDs.
-     * This gives tremendous speed-up when deleting a large amount of IDs from a Main
-     * containing thousands of those.
-     * This also means that we have to be very careful here, as we by-pass many 'common'
-     * processing, hence risking to 'corrupt' at least user counts, if not IDs themselves. */
-    bool keep_looping = true;
-    while (keep_looping) {
-      ID *id, *id_next;
-      ID *last_remapped_id = tagged_deleted_ids.last;
-      keep_looping = false;
-
-      /* First tag and remove from Main all datablocks directly from target lib.
-       * Note that we go forward here, since we want to check dependencies before users
-       * (e.g. meshes before objects). Avoids to have to loop twice. */
-      for (i = 0; i < base_count; i++) {
-        ListBase *lb = lbarray[i];
-
-        for (id = lb->first; id; id = id_next) {
-          id_next = id->next;
-          /* Note: in case we delete a library, we also delete all its datablocks! */
-          if ((id->tag & tag) || (id->lib != NULL && (id->lib->id.tag & tag))) {
-            BLI_remlink(lb, id);
-            BLI_addtail(&tagged_deleted_ids, id);
-            /* Do not tag as no_main now, we want to unlink it first (lower-level ID management
-             * code has some specific handling of 'nom main'
-             * IDs that would be a problem in that case). */
-            id->tag |= tag;
-            keep_looping = true;
-          }
-        }
-      }
-      if (last_remapped_id == NULL) {
-        dummy_link.next = tagged_deleted_ids.first;
-        last_remapped_id = (ID *)(&dummy_link);
-      }
-      for (id = last_remapped_id->next; id; id = id->next) {
-        /* Will tag 'never NULL' users of this ID too.
-         * Note that we cannot use BKE_libblock_unlink() here,
-         * since it would ignore indirect (and proxy!)
-         * links, this can lead to nasty crashing here in second, actual deleting loop.
-         * Also, this will also flag users of deleted data that cannot be unlinked
-         * (object using deleted obdata, etc.), so that they also get deleted. */
-        BKE_libblock_remap_locked(
-            bmain, id, NULL, ID_REMAP_FLAG_NEVER_NULL_USAGE | ID_REMAP_FORCE_NEVER_NULL_USAGE);
-        /* Since we removed ID from Main,
-         * we also need to unlink its own other IDs usages ourself. */
-        BKE_libblock_relink_ex(bmain, id, NULL, NULL, 0);
-        /* Now we can safely mark that ID as not being in Main database anymore. */
-        id->tag |= LIB_TAG_NO_MAIN;
-        /* This is needed because we may not have remapped usages
-         * of that ID by other deleted ones. */
-        // id->us = 0;  /* Is it actually? */
-      }
-    }
-  }
-  else {
-    /* First tag all datablocks directly from target lib.
-     * Note that we go forward here, since we want to check dependencies before users
-     * (e.g. meshes before objects).
-     * Avoids to have to loop twice. */
-    for (i = 0; i < base_count; i++) {
-      ListBase *lb = lbarray[i];
-      ID *id, *id_next;
-
-      for (id = lb->first; id; id = id_next) {
-        id_next = id->next;
-        /* Note: in case we delete a library, we also delete all its datablocks! */
-        if ((id->tag & tag) || (id->lib != NULL && (id->lib->id.tag & tag))) {
-          id->tag |= tag;
-
-          /* Will tag 'never NULL' users of this ID too.
-           * Note that we cannot use BKE_libblock_unlink() here, since it would ignore indirect
-           * (and proxy!) links, this can lead to nasty crashing here in second,
-           * actual deleting loop.
-           * Also, this will also flag users of deleted data that cannot be unlinked
-           * (object using deleted obdata, etc.), so that they also get deleted. */
-          BKE_libblock_remap_locked(
-              bmain, id, NULL, ID_REMAP_FLAG_NEVER_NULL_USAGE | ID_REMAP_FORCE_NEVER_NULL_USAGE);
-        }
-      }
-    }
-  }
-  BKE_main_unlock(bmain);
-
-  /* In usual reversed order, such that all usage of a given ID, even 'never NULL' ones,
-   * have been already cleared when we reach it
-   * (e.g. Objects being processed before meshes, they'll have already released their 'reference'
-   * over meshes when we come to freeing obdata). */
-  for (i = do_tagged_deletion ? 1 : base_count; i--;) {
-    ListBase *lb = lbarray[i];
-    ID *id, *id_next;
-
-    for (id = do_tagged_deletion ? tagged_deleted_ids.first : lb->first; id; id = id_next) {
-      id_next = id->next;
-      if (id->tag & tag) {
-        if (id->us != 0) {
-#ifdef DEBUG_PRINT
-          printf("%s: deleting %s (%d)\n", __func__, id->name, id->us);
-#endif
-          BLI_assert(id->us == 0);
-        }
-        BKE_id_free_ex(bmain, id, free_flag, !do_tagged_deletion);
-      }
-    }
-  }
-
-  bmain->is_memfile_undo_written = false;
-}
-
-/**
- * Properly delete a single ID from given \a bmain database.
- */
-void BKE_id_delete(Main *bmain, void *idv)
-{
-  BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
-  ((ID *)idv)->tag |= LIB_TAG_DOIT;
-
-  id_delete(bmain, false);
-}
-
-/**
- * Properly delete all IDs tagged with \a LIB_TAG_DOIT, in given \a bmain database.
- *
- * This is more efficient than calling #BKE_id_delete repetitively on a large set of IDs
- * (several times faster when deleting most of the IDs at once)...
- *
- * \warning Considered experimental for now, seems to be working OK but this is
- *          risky code in a complicated area.
- */
-void BKE_id_multi_tagged_delete(Main *bmain)
-{
-  id_delete(bmain, true);
-}
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
deleted file mode 100644
index cd7f03949f3..00000000000
--- a/source/blender/blenkernel/intern/library_query.c
+++ /dev/null
@@ -1,1480 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2014 by Blender Foundation.
- * All rights reserved.
- */
-
-/** \file
- * \ingroup bke
- */
-
-#include <stdlib.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_brush_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_collection_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_key_types.h"
-#include "DNA_light_types.h"
-#include "DNA_lattice_types.h"
-#include "DNA_linestyle_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_movieclip_types.h"
-#include "DNA_mask_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_force_types.h"
-#include "DNA_lightprobe_types.h"
-#include "DNA_rigidbody_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_speaker_types.h"
-#include "DNA_sound_types.h"
-#include "DNA_text_types.h"
-#include "DNA_vfont_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_workspace_types.h"
-#include "DNA_world_types.h"
-
-#include "BLI_utildefines.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist_stack.h"
-
-#include "BKE_animsys.h"
-#include "BKE_collection.h"
-#include "BKE_constraint.h"
-#include "BKE_fcurve.h"
-#include "BKE_gpencil_modifier.h"
-#include "BKE_idprop.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_main.h"
-#include "BKE_modifier.h"
-#include "BKE_node.h"
-#include "BKE_particle.h"
-#include "BKE_rigidbody.h"
-#include "BKE_sequencer.h"
-#include "BKE_shader_fx.h"
-#include "BKE_tracking.h"
-#include "BKE_workspace.h"
-
-#define FOREACH_FINALIZE _finalize
-#define FOREACH_FINALIZE_VOID \
-  if (0) { \
-    goto FOREACH_FINALIZE; \
-  } \
-  FOREACH_FINALIZE: \
-  ((void)0)
-
-#define FOREACH_CALLBACK_INVOKE_ID_PP(_data, id_pp, _cb_flag) \
-  CHECK_TYPE(id_pp, ID **); \
-  if (!((_data)->status & IDWALK_STOP)) { \
-    const int _flag = (_data)->flag; \
-    ID *old_id = *(id_pp); \
-    const int callback_return = (_data)->callback((_data)->user_data, \
-                                                  (_data)->self_id, \
-                                                  id_pp, \
-                                                  (_cb_flag | (_data)->cb_flag) & \
-                                                      ~(_data)->cb_flag_clear); \
-    if (_flag & IDWALK_READONLY) { \
-      BLI_assert(*(id_pp) == old_id); \
-    } \
-    if (old_id && (_flag & IDWALK_RECURSE)) { \
-      if (BLI_gset_add((_data)->ids_handled, old_id)) { \
-        if (!(callback_return & IDWALK_RET_STOP_RECURSION)) { \
-          BLI_LINKSTACK_PUSH((_data)->ids_todo, old_id); \
-        } \
-      } \
-    } \
-    if (callback_return & IDWALK_RET_STOP_ITER) { \
-      (_data)->status |= IDWALK_STOP; \
-      goto FOREACH_FINALIZE; \
-    } \
-  } \
-  else { \
-    goto FOREACH_FINALIZE; \
-  } \
-  ((void)0)
-
-#define FOREACH_CALLBACK_INVOKE_ID(_data, id, cb_flag) \
-  { \
-    CHECK_TYPE_ANY(id, ID *, void *); \
-    FOREACH_CALLBACK_INVOKE_ID_PP(_data, (ID **)&(id), cb_flag); \
-  } \
-  ((void)0)
-
-#define FOREACH_CALLBACK_INVOKE(_data, id_super, cb_flag) \
-  { \
-    CHECK_TYPE(&((id_super)->id), ID *); \
-    FOREACH_CALLBACK_INVOKE_ID_PP(_data, (ID **)&(id_super), cb_flag); \
-  } \
-  ((void)0)
-
-/* status */
-enum {
-  IDWALK_STOP = 1 << 0,
-};
-
-typedef struct LibraryForeachIDData {
-  ID *self_id;
-  int flag;
-  int cb_flag;
-  int cb_flag_clear;
-  LibraryIDLinkCallback callback;
-  void *user_data;
-  int status;
-
-  /* To handle recursion. */
-  GSet *ids_handled; /* All IDs that are either already done, or still in ids_todo stack. */
-  BLI_LINKSTACK_DECLARE(ids_todo, ID *);
-} LibraryForeachIDData;
-
-static void library_foreach_ID_link(Main *bmain,
-                                    ID *id,
-                                    LibraryIDLinkCallback callback,
-                                    void *user_data,
-                                    int flag,
-                                    LibraryForeachIDData *inherit_data);
-
-static void library_foreach_idproperty_ID_link(LibraryForeachIDData *data,
-                                               IDProperty *prop,
-                                               int flag)
-{
-  if (!prop) {
-    return;
-  }
-
-  switch (prop->type) {
-    case IDP_GROUP: {
-      for (IDProperty *loop = prop->data.group.first; loop; loop = loop->next) {
-        library_foreach_idproperty_ID_link(data, loop, flag);
-      }
-      break;
-    }
-    case IDP_IDPARRAY: {
-      IDProperty *loop = IDP_Array(prop);
-      for (int i = 0; i < prop->len; i++) {
-        library_foreach_idproperty_ID_link(data, &loop[i], flag);
-      }
-      break;
-    }
-    case IDP_ID:
-      FOREACH_CALLBACK_INVOKE_ID(data, prop->data.pointer, flag);
-      break;
-    default:
-      break; /* Nothing to do here with other types of IDProperties... */
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_rigidbodyworldSceneLooper(struct RigidBodyWorld *UNUSED(rbw),
-                                                      ID **id_pointer,
-                                                      void *user_data,
-                                                      int cb_flag)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_modifiersForeachIDLink(void *user_data,
-                                                   Object *UNUSED(object),
-                                                   ID **id_pointer,
-                                                   int cb_flag)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_gpencil_modifiersForeachIDLink(void *user_data,
-                                                           Object *UNUSED(object),
-                                                           ID **id_pointer,
-                                                           int cb_flag)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_shaderfxForeachIDLink(void *user_data,
-                                                  Object *UNUSED(object),
-                                                  ID **id_pointer,
-                                                  int cb_flag)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_constraintObjectLooper(bConstraint *UNUSED(con),
-                                                   ID **id_pointer,
-                                                   bool is_reference,
-                                                   void *user_data)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  const int cb_flag = is_reference ? IDWALK_CB_USER : IDWALK_CB_NOP;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_particlesystemsObjectLooper(ParticleSystem *UNUSED(psys),
-                                                        ID **id_pointer,
-                                                        void *user_data,
-                                                        int cb_flag)
-{
-  LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pointer, cb_flag);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_nla_strip(LibraryForeachIDData *data, NlaStrip *strip)
-{
-  NlaStrip *substrip;
-
-  FOREACH_CALLBACK_INVOKE(data, strip->act, IDWALK_CB_USER);
-
-  for (substrip = strip->strips.first; substrip; substrip = substrip->next) {
-    library_foreach_nla_strip(data, substrip);
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_animationData(LibraryForeachIDData *data, AnimData *adt)
-{
-  FCurve *fcu;
-  NlaTrack *nla_track;
-  NlaStrip *nla_strip;
-
-  for (fcu = adt->drivers.first; fcu; fcu = fcu->next) {
-    ChannelDriver *driver = fcu->driver;
-    DriverVar *dvar;
-
-    for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
-      /* only used targets */
-      DRIVER_TARGETS_USED_LOOPER_BEGIN (dvar) {
-        FOREACH_CALLBACK_INVOKE_ID(data, dtar->id, IDWALK_CB_NOP);
-      }
-      DRIVER_TARGETS_LOOPER_END;
-    }
-  }
-
-  FOREACH_CALLBACK_INVOKE(data, adt->action, IDWALK_CB_USER);
-  FOREACH_CALLBACK_INVOKE(data, adt->tmpact, IDWALK_CB_USER);
-
-  for (nla_track = adt->nla_tracks.first; nla_track; nla_track = nla_track->next) {
-    for (nla_strip = nla_track->strips.first; nla_strip; nla_strip = nla_strip->next) {
-      library_foreach_nla_strip(data, nla_strip);
-    }
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_mtex(LibraryForeachIDData *data, MTex *mtex)
-{
-  FOREACH_CALLBACK_INVOKE(data, mtex->object, IDWALK_CB_NOP);
-  FOREACH_CALLBACK_INVOKE(data, mtex->tex, IDWALK_CB_USER);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_paint(LibraryForeachIDData *data, Paint *paint)
-{
-  FOREACH_CALLBACK_INVOKE(data, paint->brush, IDWALK_CB_USER);
-  for (int i = 0; i < paint->tool_slots_len; i++) {
-    FOREACH_CALLBACK_INVOKE(data, paint->tool_slots[i].brush, IDWALK_CB_USER);
-  }
-  FOREACH_CALLBACK_INVOKE(data, paint->palette, IDWALK_CB_USER);
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_bone(LibraryForeachIDData *data, Bone *bone)
-{
-  library_foreach_idproperty_ID_link(data, bone->prop, IDWALK_CB_USER);
-
-  for (Bone *curbone = bone->childbase.first; curbone; curbone = curbone->next) {
-    library_foreach_bone(data, curbone);
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_layer_collection(LibraryForeachIDData *data, ListBase *lb)
-{
-  for (LayerCollection *lc = lb->first; lc; lc = lc->next) {
-    FOREACH_CALLBACK_INVOKE(data, lc->collection, IDWALK_CB_NOP);
-    library_foreach_layer_collection(data, &lc->layer_collections);
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_ID_as_subdata_link(ID **id_pp,
-                                               LibraryIDLinkCallback callback,
-                                               void *user_data,
-                                               int flag,
-                                               LibraryForeachIDData *data)
-{
-  /* Needed e.g. for callbacks handling relationships... This call shall be absolutely readonly. */
-  ID *id = *id_pp;
-  FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pp, IDWALK_CB_PRIVATE);
-  BLI_assert(id == *id_pp);
-
-  if (flag & IDWALK_RECURSE) {
-    /* Defer handling into main loop, recursively calling BKE_library_foreach_ID_link in
-     * IDWALK_RECURSE case is troublesome, see T49553. */
-    if (BLI_gset_add(data->ids_handled, id)) {
-      BLI_LINKSTACK_PUSH(data->ids_todo, id);
-    }
-  }
-  else {
-    library_foreach_ID_link(NULL, id, callback, user_data, flag, data);
-  }
-
-  FOREACH_FINALIZE_VOID;
-}
-
-static void library_foreach_ID_link(Main *bmain,
-                                    ID *id,
-                                    LibraryIDLinkCallback callback,
-                                    void *user_data,
-                                    int flag,
-                                    LibraryForeachIDData *inherit_data)
-{
-  LibraryForeachIDData data;
-  int i;
-
-  if (flag & IDWALK_RECURSE) {
-    /* For now, recursion implies read-only. */
-    flag |= IDWALK_READONLY;
-
-    data.ids_handled = BLI_gset_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__);
-    BLI_LINKSTACK_INIT(data.ids_todo);
-
-    BLI_gset_add(data.ids_handled, id);
-  }
-  else {
-    data.ids_handled = NULL;
-  }
-  data.flag = flag;
-  data.status = 0;
-  data.callback = callback;
-  data.user_data = user_data;
-
-#define CALLBACK_INVOKE_ID(check_id, cb_flag) FOREACH_CALLBACK_INVOKE_ID(&data, check_id, cb_flag)
-
-#define CALLBACK_INVOKE(check_id_super, cb_flag) \
-  FOREACH_CALLBACK_INVOKE(&data, check_id_super, cb_flag)
-
-  for (; id != NULL; id = (flag & IDWALK_RECURSE) ? BLI_LINKSTACK_POP(data.ids_todo) : NULL) {
-    data.self_id = id;
-
-    /* inherit_data is non-NULL when this function is called for some sub-data ID
-     * (like root nodetree of a material).
-     * In that case, we do not want to generate those 'generic flags' from our current sub-data ID
-     * (the node tree), but re-use those generated for the 'owner' ID (the material). */
-    if (inherit_data == NULL) {
-      data.cb_flag = ID_IS_LINKED(id) ? IDWALK_CB_INDIRECT_USAGE : 0;
-      /* When an ID is not in Main database, it should never refcount IDs it is using.
-       * Exceptions: NodeTrees (yeeahhh!) directly used by Materials. */
-      data.cb_flag_clear = (id->tag & LIB_TAG_NO_MAIN) ? IDWALK_CB_USER | IDWALK_CB_USER_ONE : 0;
-    }
-    else {
-      data.cb_flag = inherit_data->cb_flag;
-      data.cb_flag_clear = inherit_data->cb_flag_clear;
-    }
-
-    if (bmain != NULL && bmain->relations != NULL && (flag & IDWALK_READONLY)) {
-      /* Note that this is minor optimization, even in worst cases (like id being an object with
-       * lots of drivers and constraints and modifiers, or material etc. with huge node tree),
-       * but we might as well use it (Main->relations is always assumed valid,
-       * it's responsibility of code creating it to free it,
-       * especially if/when it starts modifying Main database). */
-      MainIDRelationsEntry *entry = BLI_ghash_lookup(bmain->relations->id_user_to_used, id);
-      for (; entry != NULL; entry = entry->next) {
-        FOREACH_CALLBACK_INVOKE_ID_PP(&data, entry->id_pointer, entry->usage_flag);
-      }
-      continue;
-    }
-
-    /* Generic ID handling. */
-    /* Note: strictly runtime, short-life utility pointers like ID.newid or ID.uuid.id are
-     * purposedly completely ignored here. */
-
-    if (id->override_library != NULL) {
-      CALLBACK_INVOKE_ID(id->override_library->reference,
-                         IDWALK_CB_USER | IDWALK_CB_OVERRIDE_LIBRARY_REFERENCE);
-      CALLBACK_INVOKE_ID(id->override_library->storage,
-                         IDWALK_CB_USER | IDWALK_CB_OVERRIDE_LIBRARY_REFERENCE);
-    }
-
-    library_foreach_idproperty_ID_link(&data, id->properties, IDWALK_CB_USER);
-
-    AnimData *adt = BKE_animdata_from_id(id);
-    if (adt) {
-      library_foreach_animationData(&data, adt);
-    }
-
-    /* ID handling specific to each data type. */
-    switch ((ID_Type)GS(id->name)) {
-      case ID_LI: {
-        Library *lib = (Library *)id;
-        CALLBACK_INVOKE(lib->parent, IDWALK_CB_NEVER_SELF);
-        break;
-      }
-      case ID_SCE: {
-        Scene *scene = (Scene *)id;
-        ToolSettings *toolsett = scene->toolsettings;
-
-        CALLBACK_INVOKE(scene->camera, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(scene->world, IDWALK_CB_USER);
-        CALLBACK_INVOKE(scene->set, IDWALK_CB_NEVER_SELF);
-        CALLBACK_INVOKE(scene->clip, IDWALK_CB_USER);
-        CALLBACK_INVOKE(scene->gpd, IDWALK_CB_USER);
-        CALLBACK_INVOKE(scene->r.bake.cage_object, IDWALK_CB_NOP);
-        if (scene->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&scene->nodetree, callback, user_data, flag, &data);
-        }
-        if (scene->ed) {
-          Sequence *seq;
-          SEQP_BEGIN (scene->ed, seq) {
-            CALLBACK_INVOKE(seq->scene, IDWALK_CB_NEVER_SELF);
-            CALLBACK_INVOKE(seq->scene_camera, IDWALK_CB_NOP);
-            CALLBACK_INVOKE(seq->clip, IDWALK_CB_USER);
-            CALLBACK_INVOKE(seq->mask, IDWALK_CB_USER);
-            CALLBACK_INVOKE(seq->sound, IDWALK_CB_USER);
-            library_foreach_idproperty_ID_link(&data, seq->prop, IDWALK_CB_USER);
-            for (SequenceModifierData *smd = seq->modifiers.first; smd; smd = smd->next) {
-              CALLBACK_INVOKE(smd->mask_id, IDWALK_CB_USER);
-            }
-
-            if (seq->type == SEQ_TYPE_TEXT && seq->effectdata) {
-              TextVars *text_data = seq->effectdata;
-              CALLBACK_INVOKE(text_data->text_font, IDWALK_CB_USER);
-            }
-          }
-          SEQ_END;
-        }
-
-        for (CollectionObject *cob = scene->master_collection->gobject.first; cob;
-             cob = cob->next) {
-          CALLBACK_INVOKE(cob->ob, IDWALK_CB_USER);
-        }
-        for (CollectionChild *child = scene->master_collection->children.first; child;
-             child = child->next) {
-          CALLBACK_INVOKE(child->collection, IDWALK_CB_USER);
-        }
-
-        ViewLayer *view_layer;
-        for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
-          CALLBACK_INVOKE(view_layer->mat_override, IDWALK_CB_USER);
-
-          for (Base *base = view_layer->object_bases.first; base; base = base->next) {
-            CALLBACK_INVOKE(base->object, IDWALK_CB_NOP);
-          }
-
-          library_foreach_layer_collection(&data, &view_layer->layer_collections);
-
-          for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc;
-               fmc = fmc->next) {
-            if (fmc->script) {
-              CALLBACK_INVOKE(fmc->script, IDWALK_CB_NOP);
-            }
-          }
-
-          for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls;
-               fls = fls->next) {
-            if (fls->group) {
-              CALLBACK_INVOKE(fls->group, IDWALK_CB_USER);
-            }
-
-            if (fls->linestyle) {
-              CALLBACK_INVOKE(fls->linestyle, IDWALK_CB_USER);
-            }
-          }
-        }
-
-        for (TimeMarker *marker = scene->markers.first; marker; marker = marker->next) {
-          CALLBACK_INVOKE(marker->camera, IDWALK_CB_NOP);
-        }
-
-        if (toolsett) {
-          CALLBACK_INVOKE(toolsett->particle.scene, IDWALK_CB_NOP);
-          CALLBACK_INVOKE(toolsett->particle.object, IDWALK_CB_NOP);
-          CALLBACK_INVOKE(toolsett->particle.shape_object, IDWALK_CB_NOP);
-
-          library_foreach_paint(&data, &toolsett->imapaint.paint);
-          CALLBACK_INVOKE(toolsett->imapaint.stencil, IDWALK_CB_USER);
-          CALLBACK_INVOKE(toolsett->imapaint.clone, IDWALK_CB_USER);
-          CALLBACK_INVOKE(toolsett->imapaint.canvas, IDWALK_CB_USER);
-
-          if (toolsett->vpaint) {
-            library_foreach_paint(&data, &toolsett->vpaint->paint);
-          }
-          if (toolsett->wpaint) {
-            library_foreach_paint(&data, &toolsett->wpaint->paint);
-          }
-          if (toolsett->sculpt) {
-            library_foreach_paint(&data, &toolsett->sculpt->paint);
-            CALLBACK_INVOKE(toolsett->sculpt->gravity_object, IDWALK_CB_NOP);
-          }
-          if (toolsett->uvsculpt) {
-            library_foreach_paint(&data, &toolsett->uvsculpt->paint);
-          }
-          if (toolsett->gp_paint) {
-            library_foreach_paint(&data, &toolsett->gp_paint->paint);
-          }
-
-          CALLBACK_INVOKE(toolsett->gp_sculpt.guide.reference_object, IDWALK_CB_NOP);
-        }
-
-        if (scene->rigidbody_world) {
-          BKE_rigidbody_world_id_loop(
-              scene->rigidbody_world, library_foreach_rigidbodyworldSceneLooper, &data);
-        }
-
-        break;
-      }
-
-      case ID_OB: {
-        Object *object = (Object *)id;
-        ParticleSystem *psys;
-
-        /* Object is special, proxies make things hard... */
-        const int data_cb_flag = data.cb_flag;
-        const int proxy_cb_flag = ((data.flag & IDWALK_NO_INDIRECT_PROXY_DATA_USAGE) == 0 &&
-                                   (object->proxy || object->proxy_group)) ?
-                                      IDWALK_CB_INDIRECT_USAGE :
-                                      0;
-
-        /* object data special case */
-        data.cb_flag |= proxy_cb_flag;
-        if (object->type == OB_EMPTY) {
-          /* empty can have NULL or Image */
-          CALLBACK_INVOKE_ID(object->data, IDWALK_CB_USER);
-        }
-        else {
-          /* when set, this can't be NULL */
-          if (object->data) {
-            CALLBACK_INVOKE_ID(object->data, IDWALK_CB_USER | IDWALK_CB_NEVER_NULL);
-          }
-        }
-        data.cb_flag = data_cb_flag;
-
-        CALLBACK_INVOKE(object->parent, IDWALK_CB_NEVER_SELF);
-        CALLBACK_INVOKE(object->track, IDWALK_CB_NEVER_SELF);
-        /* object->proxy is refcounted, but not object->proxy_group... *sigh* */
-        CALLBACK_INVOKE(object->proxy, IDWALK_CB_USER | IDWALK_CB_NEVER_SELF);
-        CALLBACK_INVOKE(object->proxy_group, IDWALK_CB_NOP);
-
-        /* Special case!
-         * Since this field is set/owned by 'user' of this ID (and not ID itself),
-         * it is only indirect usage if proxy object is linked... Twisted. */
-        if (object->proxy_from) {
-          data.cb_flag = ID_IS_LINKED(object->proxy_from) ? IDWALK_CB_INDIRECT_USAGE : 0;
-        }
-        CALLBACK_INVOKE(object->proxy_from, IDWALK_CB_LOOPBACK | IDWALK_CB_NEVER_SELF);
-        data.cb_flag = data_cb_flag;
-
-        CALLBACK_INVOKE(object->poselib, IDWALK_CB_USER);
-
-        data.cb_flag |= proxy_cb_flag;
-        for (i = 0; i < object->totcol; i++) {
-          CALLBACK_INVOKE(object->mat[i], IDWALK_CB_USER);
-        }
-        data.cb_flag = data_cb_flag;
-
-        /* Note that ob->gpd is deprecated, so no need to handle it here. */
-        CALLBACK_INVOKE(object->instance_collection, IDWALK_CB_USER);
-
-        if (object->pd) {
-          CALLBACK_INVOKE(object->pd->tex, IDWALK_CB_USER);
-          CALLBACK_INVOKE(object->pd->f_source, IDWALK_CB_NOP);
-        }
-        /* Note that ob->effect is deprecated, so no need to handle it here. */
-
-        if (object->pose) {
-          bPoseChannel *pchan;
-
-          data.cb_flag |= proxy_cb_flag;
-          for (pchan = object->pose->chanbase.first; pchan; pchan = pchan->next) {
-            library_foreach_idproperty_ID_link(&data, pchan->prop, IDWALK_CB_USER);
-            CALLBACK_INVOKE(pchan->custom, IDWALK_CB_USER);
-            BKE_constraints_id_loop(
-                &pchan->constraints, library_foreach_constraintObjectLooper, &data);
-          }
-          data.cb_flag = data_cb_flag;
-        }
-
-        if (object->rigidbody_constraint) {
-          CALLBACK_INVOKE(object->rigidbody_constraint->ob1, IDWALK_CB_NEVER_SELF);
-          CALLBACK_INVOKE(object->rigidbody_constraint->ob2, IDWALK_CB_NEVER_SELF);
-        }
-
-        if (object->lodlevels.first) {
-          LodLevel *level;
-          for (level = object->lodlevels.first; level; level = level->next) {
-            CALLBACK_INVOKE(level->source, IDWALK_CB_NEVER_SELF);
-          }
-        }
-
-        modifiers_foreachIDLink(object, library_foreach_modifiersForeachIDLink, &data);
-        BKE_gpencil_modifiers_foreachIDLink(
-            object, library_foreach_gpencil_modifiersForeachIDLink, &data);
-        BKE_constraints_id_loop(
-            &object->constraints, library_foreach_constraintObjectLooper, &data);
-        BKE_shaderfx_foreachIDLink(object, library_foreach_shaderfxForeachIDLink, &data);
-
-        for (psys = object->particlesystem.first; psys; psys = psys->next) {
-          BKE_particlesystem_id_loop(psys, library_foreach_particlesystemsObjectLooper, &data);
-        }
-
-        if (object->soft) {
-          CALLBACK_INVOKE(object->soft->collision_group, IDWALK_CB_NOP);
-
-          if (object->soft->effector_weights) {
-            CALLBACK_INVOKE(object->soft->effector_weights->group, IDWALK_CB_NOP);
-          }
-        }
-        break;
-      }
-
-      case ID_AR: {
-        bArmature *arm = (bArmature *)id;
-
-        for (Bone *bone = arm->bonebase.first; bone; bone = bone->next) {
-          library_foreach_bone(&data, bone);
-        }
-        break;
-      }
-
-      case ID_ME: {
-        Mesh *mesh = (Mesh *)id;
-        CALLBACK_INVOKE(mesh->texcomesh, IDWALK_CB_NEVER_SELF);
-        CALLBACK_INVOKE(mesh->key, IDWALK_CB_USER);
-        for (i = 0; i < mesh->totcol; i++) {
-          CALLBACK_INVOKE(mesh->mat[i], IDWALK_CB_USER);
-        }
-        break;
-      }
-
-      case ID_CU: {
-        Curve *curve = (Curve *)id;
-        CALLBACK_INVOKE(curve->bevobj, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(curve->taperobj, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(curve->textoncurve, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(curve->key, IDWALK_CB_USER);
-        for (i = 0; i < curve->totcol; i++) {
-          CALLBACK_INVOKE(curve->mat[i], IDWALK_CB_USER);
-        }
-        CALLBACK_INVOKE(curve->vfont, IDWALK_CB_USER);
-        CALLBACK_INVOKE(curve->vfontb, IDWALK_CB_USER);
-        CALLBACK_INVOKE(curve->vfonti, IDWALK_CB_USER);
-        CALLBACK_INVOKE(curve->vfontbi, IDWALK_CB_USER);
-        break;
-      }
-
-      case ID_MB: {
-        MetaBall *metaball = (MetaBall *)id;
-        for (i = 0; i < metaball->totcol; i++) {
-          CALLBACK_INVOKE(metaball->mat[i], IDWALK_CB_USER);
-        }
-        break;
-      }
-
-      case ID_MA: {
-        Material *material = (Material *)id;
-        if (material->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&material->nodetree, callback, user_data, flag, &data);
-        }
-        if (material->texpaintslot != NULL) {
-          CALLBACK_INVOKE(material->texpaintslot->ima, IDWALK_CB_NOP);
-        }
-        if (material->gp_style != NULL) {
-          CALLBACK_INVOKE(material->gp_style->sima, IDWALK_CB_USER);
-          CALLBACK_INVOKE(material->gp_style->ima, IDWALK_CB_USER);
-        }
-        break;
-      }
-
-      case ID_TE: {
-        Tex *texture = (Tex *)id;
-        if (texture->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&texture->nodetree, callback, user_data, flag, &data);
-        }
-        CALLBACK_INVOKE(texture->ima, IDWALK_CB_USER);
-        break;
-      }
-
-      case ID_LT: {
-        Lattice *lattice = (Lattice *)id;
-        CALLBACK_INVOKE(lattice->key, IDWALK_CB_USER);
-        break;
-      }
-
-      case ID_LA: {
-        Light *lamp = (Light *)id;
-        if (lamp->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&lamp->nodetree, callback, user_data, flag, &data);
-        }
-        break;
-      }
-
-      case ID_CA: {
-        Camera *camera = (Camera *)id;
-        CALLBACK_INVOKE(camera->dof.focus_object, IDWALK_CB_NOP);
-        for (CameraBGImage *bgpic = camera->bg_images.first; bgpic; bgpic = bgpic->next) {
-          if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) {
-            CALLBACK_INVOKE(bgpic->ima, IDWALK_CB_USER);
-          }
-          else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) {
-            CALLBACK_INVOKE(bgpic->clip, IDWALK_CB_USER);
-          }
-        }
-
-        break;
-      }
-
-      case ID_KE: {
-        Key *key = (Key *)id;
-        CALLBACK_INVOKE_ID(key->from, IDWALK_CB_LOOPBACK);
-        break;
-      }
-
-      case ID_WO: {
-        World *world = (World *)id;
-        if (world->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&world->nodetree, callback, user_data, flag, &data);
-        }
-        break;
-      }
-
-      case ID_SPK: {
-        Speaker *speaker = (Speaker *)id;
-        CALLBACK_INVOKE(speaker->sound, IDWALK_CB_USER);
-        break;
-      }
-
-      case ID_LP: {
-        LightProbe *probe = (LightProbe *)id;
-        CALLBACK_INVOKE(probe->image, IDWALK_CB_USER);
-        CALLBACK_INVOKE(probe->visibility_grp, IDWALK_CB_NOP);
-        break;
-      }
-
-      case ID_GR: {
-        Collection *collection = (Collection *)id;
-        for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
-          CALLBACK_INVOKE(cob->ob, IDWALK_CB_USER);
-        }
-        for (CollectionChild *child = collection->children.first; child; child = child->next) {
-          CALLBACK_INVOKE(child->collection, IDWALK_CB_NEVER_SELF | IDWALK_CB_USER);
-        }
-        for (CollectionParent *parent = collection->parents.first; parent; parent = parent->next) {
-          CALLBACK_INVOKE(parent->collection, IDWALK_CB_NEVER_SELF | IDWALK_CB_LOOPBACK);
-        }
-        break;
-      }
-
-      case ID_NT: {
-        bNodeTree *ntree = (bNodeTree *)id;
-        bNode *node;
-        bNodeSocket *sock;
-
-        CALLBACK_INVOKE(ntree->gpd, IDWALK_CB_USER);
-
-        for (node = ntree->nodes.first; node; node = node->next) {
-          CALLBACK_INVOKE_ID(node->id, IDWALK_CB_USER);
-
-          library_foreach_idproperty_ID_link(&data, node->prop, IDWALK_CB_USER);
-          for (sock = node->inputs.first; sock; sock = sock->next) {
-            library_foreach_idproperty_ID_link(&data, sock->prop, IDWALK_CB_USER);
-          }
-          for (sock = node->outputs.first; sock; sock = sock->next) {
-            library_foreach_idproperty_ID_link(&data, sock->prop, IDWALK_CB_USER);
-          }
-        }
-
-        for (sock = ntree->inputs.first; sock; sock = sock->next) {
-          library_foreach_idproperty_ID_link(&data, sock->prop, IDWALK_CB_USER);
-        }
-        for (sock = ntree->outputs.first; sock; sock = sock->next) {
-          library_foreach_idproperty_ID_link(&data, sock->prop, IDWALK_CB_USER);
-        }
-        break;
-      }
-
-      case ID_BR: {
-        Brush *brush = (Brush *)id;
-        CALLBACK_INVOKE(brush->toggle_brush, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(brush->clone.image, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(brush->paint_curve, IDWALK_CB_USER);
-        if (brush->gpencil_settings) {
-          CALLBACK_INVOKE(brush->gpencil_settings->material, IDWALK_CB_USER);
-        }
-        library_foreach_mtex(&data, &brush->mtex);
-        library_foreach_mtex(&data, &brush->mask_mtex);
-        break;
-      }
-
-      case ID_PA: {
-        ParticleSettings *psett = (ParticleSettings *)id;
-        CALLBACK_INVOKE(psett->instance_collection, IDWALK_CB_USER);
-        CALLBACK_INVOKE(psett->instance_object, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(psett->bb_ob, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(psett->collision_group, IDWALK_CB_NOP);
-
-        for (i = 0; i < MAX_MTEX; i++) {
-          if (psett->mtex[i]) {
-            library_foreach_mtex(&data, psett->mtex[i]);
-          }
-        }
-
-        if (psett->effector_weights) {
-          CALLBACK_INVOKE(psett->effector_weights->group, IDWALK_CB_NOP);
-        }
-
-        if (psett->pd) {
-          CALLBACK_INVOKE(psett->pd->tex, IDWALK_CB_USER);
-          CALLBACK_INVOKE(psett->pd->f_source, IDWALK_CB_NOP);
-        }
-        if (psett->pd2) {
-          CALLBACK_INVOKE(psett->pd2->tex, IDWALK_CB_USER);
-          CALLBACK_INVOKE(psett->pd2->f_source, IDWALK_CB_NOP);
-        }
-
-        if (psett->boids) {
-          BoidState *state;
-          BoidRule *rule;
-
-          for (state = psett->boids->states.first; state; state = state->next) {
-            for (rule = state->rules.first; rule; rule = rule->next) {
-              if (rule->type == eBoidRuleType_Avoid) {
-                BoidRuleGoalAvoid *gabr = (BoidRuleGoalAvoid *)rule;
-                CALLBACK_INVOKE(gabr->ob, IDWALK_CB_NOP);
-              }
-              else if (rule->type == eBoidRuleType_FollowLeader) {
-                BoidRuleFollowLeader *flbr = (BoidRuleFollowLeader *)rule;
-                CALLBACK_INVOKE(flbr->ob, IDWALK_CB_NOP);
-              }
-            }
-          }
-        }
-
-        for (ParticleDupliWeight *dw = psett->instance_weights.first; dw; dw = dw->next) {
-          CALLBACK_INVOKE(dw->ob, IDWALK_CB_NOP);
-        }
-        break;
-      }
-
-      case ID_MC: {
-        MovieClip *clip = (MovieClip *)id;
-        MovieTracking *tracking = &clip->tracking;
-        MovieTrackingObject *object;
-        MovieTrackingTrack *track;
-        MovieTrackingPlaneTrack *plane_track;
-
-        CALLBACK_INVOKE(clip->gpd, IDWALK_CB_USER);
-
-        for (track = tracking->tracks.first; track; track = track->next) {
-          CALLBACK_INVOKE(track->gpd, IDWALK_CB_USER);
-        }
-        for (object = tracking->objects.first; object; object = object->next) {
-          for (track = object->tracks.first; track; track = track->next) {
-            CALLBACK_INVOKE(track->gpd, IDWALK_CB_USER);
-          }
-        }
-
-        for (plane_track = tracking->plane_tracks.first; plane_track;
-             plane_track = plane_track->next) {
-          CALLBACK_INVOKE(plane_track->image, IDWALK_CB_USER);
-        }
-        break;
-      }
-
-      case ID_MSK: {
-        Mask *mask = (Mask *)id;
-        MaskLayer *mask_layer;
-        for (mask_layer = mask->masklayers.first; mask_layer; mask_layer = mask_layer->next) {
-          MaskSpline *mask_spline;
-
-          for (mask_spline = mask_layer->splines.first; mask_spline;
-               mask_spline = mask_spline->next) {
-            for (i = 0; i < mask_spline->tot_point; i++) {
-              MaskSplinePoint *point = &mask_spline->points[i];
-              CALLBACK_INVOKE_ID(point->parent.id, IDWALK_CB_USER);
-            }
-          }
-        }
-        break;
-      }
-
-      case ID_LS: {
-        FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
-        LineStyleModifier *lsm;
-        for (i = 0; i < MAX_MTEX; i++) {
-          if (linestyle->mtex[i]) {
-            library_foreach_mtex(&data, linestyle->mtex[i]);
-          }
-        }
-        if (linestyle->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          library_foreach_ID_as_subdata_link(
-              (ID **)&linestyle->nodetree, callback, user_data, flag, &data);
-        }
-
-        for (lsm = linestyle->color_modifiers.first; lsm; lsm = lsm->next) {
-          if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
-            LineStyleColorModifier_DistanceFromObject *p =
-                (LineStyleColorModifier_DistanceFromObject *)lsm;
-            if (p->target) {
-              CALLBACK_INVOKE(p->target, IDWALK_CB_NOP);
-            }
-          }
-        }
-        for (lsm = linestyle->alpha_modifiers.first; lsm; lsm = lsm->next) {
-          if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
-            LineStyleAlphaModifier_DistanceFromObject *p =
-                (LineStyleAlphaModifier_DistanceFromObject *)lsm;
-            if (p->target) {
-              CALLBACK_INVOKE(p->target, IDWALK_CB_NOP);
-            }
-          }
-        }
-        for (lsm = linestyle->thickness_modifiers.first; lsm; lsm = lsm->next) {
-          if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
-            LineStyleThicknessModifier_DistanceFromObject *p =
-                (LineStyleThicknessModifier_DistanceFromObject *)lsm;
-            if (p->target) {
-              CALLBACK_INVOKE(p->target, IDWALK_CB_NOP);
-            }
-          }
-        }
-        break;
-      }
-      case ID_AC: {
-        bAction *act = (bAction *)id;
-
-        for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
-          CALLBACK_INVOKE(marker->camera, IDWALK_CB_NOP);
-        }
-        break;
-      }
-
-      case ID_WM: {
-        wmWindowManager *wm = (wmWindowManager *)id;
-
-        for (wmWindow *win = wm->windows.first; win; win = win->next) {
-          ID *workspace = (ID *)BKE_workspace_active_get(win->workspace_hook);
-
-          CALLBACK_INVOKE(win->scene, IDWALK_CB_USER_ONE);
-
-          CALLBACK_INVOKE_ID(workspace, IDWALK_CB_NOP);
-          /* allow callback to set a different workspace */
-          BKE_workspace_active_set(win->workspace_hook, (WorkSpace *)workspace);
-        }
-        break;
-      }
-
-      case ID_WS: {
-        WorkSpace *workspace = (WorkSpace *)id;
-        ListBase *layouts = BKE_workspace_layouts_get(workspace);
-
-        for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) {
-          bScreen *screen = BKE_workspace_layout_screen_get(layout);
-
-          /* CALLBACK_INVOKE expects an actual pointer, not a variable holding the pointer.
-           * However we can't access layout->screen here
-           * since we are outside the workspace project. */
-          CALLBACK_INVOKE(screen, IDWALK_CB_USER);
-          /* allow callback to set a different screen */
-          BKE_workspace_layout_screen_set(layout, screen);
-        }
-        break;
-      }
-      case ID_GD: {
-        bGPdata *gpencil = (bGPdata *)id;
-        /* materials */
-        for (i = 0; i < gpencil->totcol; i++) {
-          CALLBACK_INVOKE(gpencil->mat[i], IDWALK_CB_USER);
-        }
-
-        for (bGPDlayer *gplayer = gpencil->layers.first; gplayer != NULL;
-             gplayer = gplayer->next) {
-          CALLBACK_INVOKE(gplayer->parent, IDWALK_CB_NOP);
-        }
-
-        break;
-      }
-
-      /* Nothing needed for those... */
-      case ID_SCR:
-      case ID_IM:
-      case ID_VF:
-      case ID_TXT:
-      case ID_SO:
-      case ID_PAL:
-      case ID_PC:
-      case ID_CF:
-        break;
-
-      /* Deprecated. */
-      case ID_IP:
-        break;
-    }
-  }
-
-FOREACH_FINALIZE:
-  if (data.ids_handled) {
-    BLI_gset_free(data.ids_handled, NULL);
-    BLI_LINKSTACK_FREE(data.ids_todo);
-  }
-
-#undef CALLBACK_INVOKE_ID
-#undef CALLBACK_INVOKE
-}
-
-#undef FOREACH_CALLBACK_INVOKE_ID
-#undef FOREACH_CALLBACK_INVOKE
-
-/**
- * Loop over all of the ID's this data-block links to.
- */
-void BKE_library_foreach_ID_link(
-    Main *bmain, ID *id, LibraryIDLinkCallback callback, void *user_data, int flag)
-{
-  library_foreach_ID_link(bmain, id, callback, user_data, flag, NULL);
-}
-
-/**
- * re-usable function, use when replacing ID's
- */
-void BKE_library_update_ID_link_user(ID *id_dst, ID *id_src, const int cb_flag)
-{
-  if (cb_flag & IDWALK_CB_USER) {
-    id_us_min(id_src);
-    id_us_plus(id_dst);
-  }
-  else if (cb_flag & IDWALK_CB_USER_ONE) {
-    id_us_ensure_real(id_dst);
-  }
-}
-
-/**
- * Say whether given \a id_type_owner can use (in any way) a data-block of \a id_type_used.
- *
- * This is a 'simplified' abstract version of #BKE_library_foreach_ID_link() above,
- * quite useful to reduce* useless iterations in some cases.
- */
-/* XXX This has to be fully rethink, basing check on ID type is not really working anymore
- * (and even worth once IDProps will support ID pointers),
- * we'll have to do some quick checks on IDs themselves... */
-bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
-{
-  /* any type of ID can be used in custom props. */
-  if (id_owner->properties) {
-    return true;
-  }
-
-  const short id_type_owner = GS(id_owner->name);
-
-  /* IDProps of armature bones and nodes, and bNode->id can use virtually any type of ID. */
-  if (ELEM(id_type_owner, ID_NT, ID_AR)) {
-    return true;
-  }
-
-  if (ntreeFromID(id_owner)) {
-    return true;
-  }
-
-  if (BKE_animdata_from_id(id_owner)) {
-    /* AnimationData can use virtually any kind of data-blocks, through drivers especially. */
-    return true;
-  }
-
-  switch ((ID_Type)id_type_owner) {
-    case ID_LI:
-      return ELEM(id_type_used, ID_LI);
-    case ID_SCE:
-      return (ELEM(id_type_used,
-                   ID_OB,
-                   ID_WO,
-                   ID_SCE,
-                   ID_MC,
-                   ID_MA,
-                   ID_GR,
-                   ID_TXT,
-                   ID_LS,
-                   ID_MSK,
-                   ID_SO,
-                   ID_GD,
-                   ID_BR,
-                   ID_PAL,
-                   ID_IM,
-                   ID_NT));
-    case ID_OB:
-      /* Could be more specific, but simpler to just always say 'yes' here. */
-      return true;
-    case ID_ME:
-      return ELEM(id_type_used, ID_ME, ID_KE, ID_MA, ID_IM);
-    case ID_CU:
-      return ELEM(id_type_used, ID_OB, ID_KE, ID_MA, ID_VF);
-    case ID_MB:
-      return ELEM(id_type_used, ID_MA);
-    case ID_MA:
-      return (ELEM(id_type_used, ID_TE, ID_GR));
-    case ID_TE:
-      return (ELEM(id_type_used, ID_IM, ID_OB));
-    case ID_LT:
-      return ELEM(id_type_used, ID_KE);
-    case ID_LA:
-      return (ELEM(id_type_used, ID_TE));
-    case ID_CA:
-      return ELEM(id_type_used, ID_OB);
-    case ID_KE:
-      /* Warning! key->from, could be more types in future? */
-      return ELEM(id_type_used, ID_ME, ID_CU, ID_LT);
-    case ID_SCR:
-      return ELEM(id_type_used, ID_SCE);
-    case ID_WO:
-      return (ELEM(id_type_used, ID_TE));
-    case ID_SPK:
-      return ELEM(id_type_used, ID_SO);
-    case ID_GR:
-      return ELEM(id_type_used, ID_OB, ID_GR);
-    case ID_NT:
-      /* Could be more specific, but node.id has no type restriction... */
-      return true;
-    case ID_BR:
-      return ELEM(id_type_used, ID_BR, ID_IM, ID_PC, ID_TE, ID_MA);
-    case ID_PA:
-      return ELEM(id_type_used, ID_OB, ID_GR, ID_TE);
-    case ID_MC:
-      return ELEM(id_type_used, ID_GD, ID_IM);
-    case ID_MSK:
-      /* WARNING! mask->parent.id, not typed. */
-      return ELEM(id_type_used, ID_MC);
-    case ID_LS:
-      return (ELEM(id_type_used, ID_TE, ID_OB));
-    case ID_LP:
-      return ELEM(id_type_used, ID_IM);
-    case ID_GD:
-      return ELEM(id_type_used, ID_MA);
-    case ID_WS:
-      return ELEM(id_type_used, ID_SCR, ID_SCE);
-    case ID_IM:
-    case ID_VF:
-    case ID_TXT:
-    case ID_SO:
-    case ID_AR:
-    case ID_AC:
-    case ID_WM:
-    case ID_PAL:
-    case ID_PC:
-    case ID_CF:
-      /* Those types never use/reference other IDs... */
-      return false;
-    case ID_IP:
-      /* Deprecated... */
-      return false;
-  }
-  return false;
-}
-
-/* ***** ID users iterator. ***** */
-typedef struct IDUsersIter {
-  ID *id;
-
-  ListBase *lb_array[MAX_LIBARRAY];
-  int lb_idx;
-
-  ID *curr_id;
-  int count_direct, count_indirect; /* Set by callback. */
-} IDUsersIter;
-
-static int foreach_libblock_id_users_callback(void *user_data,
-                                              ID *UNUSED(self_id),
-                                              ID **id_p,
-                                              int cb_flag)
-{
-  IDUsersIter *iter = user_data;
-
-  if (*id_p) {
-    /* 'Loopback' ID pointers (the ugly 'from' ones, Object->proxy_from and Key->from).
-     * Those are not actually ID usage, we can ignore them here.
-     */
-    if (cb_flag & IDWALK_CB_LOOPBACK) {
-      return IDWALK_RET_NOP;
-    }
-
-    if (*id_p == iter->id) {
-#if 0
-      printf(
-          "%s uses %s (refcounted: %d, userone: %d, used_one: %d, used_one_active: %d, "
-          "indirect_usage: %d)\n",
-          iter->curr_id->name,
-          iter->id->name,
-          (cb_flag & IDWALK_USER) ? 1 : 0,
-          (cb_flag & IDWALK_USER_ONE) ? 1 : 0,
-          (iter->id->tag & LIB_TAG_EXTRAUSER) ? 1 : 0,
-          (iter->id->tag & LIB_TAG_EXTRAUSER_SET) ? 1 : 0,
-          (cb_flag & IDWALK_INDIRECT_USAGE) ? 1 : 0);
-#endif
-      if (cb_flag & IDWALK_CB_INDIRECT_USAGE) {
-        iter->count_indirect++;
-      }
-      else {
-        iter->count_direct++;
-      }
-    }
-  }
-
-  return IDWALK_RET_NOP;
-}
-
-/**
- * Return the number of times given \a id_user uses/references \a id_used.
- *
- * \note This only checks for pointer references of an ID, shallow usages
- * (like e.g. by RNA paths, as done for FCurves) are not detected at all.
- *
- * \param id_user: the ID which is supposed to use (reference) \a id_used.
- * \param id_used: the ID which is supposed to be used (referenced) by \a id_user.
- * \return the number of direct usages/references of \a id_used by \a id_user.
- */
-int BKE_library_ID_use_ID(ID *id_user, ID *id_used)
-{
-  IDUsersIter iter;
-
-  /* We do not care about iter.lb_array/lb_idx here... */
-  iter.id = id_used;
-  iter.curr_id = id_user;
-  iter.count_direct = iter.count_indirect = 0;
-
-  BKE_library_foreach_ID_link(
-      NULL, iter.curr_id, foreach_libblock_id_users_callback, (void *)&iter, IDWALK_READONLY);
-
-  return iter.count_direct + iter.count_indirect;
-}
-
-static bool library_ID_is_used(Main *bmain, void *idv, const bool check_linked)
-{
-  IDUsersIter iter;
-  ListBase *lb_array[MAX_LIBARRAY];
-  ID *id = idv;
-  int i = set_listbasepointers(bmain, lb_array);
-  bool is_defined = false;
-
-  iter.id = id;
-  iter.count_direct = iter.count_indirect = 0;
-  while (i-- && !is_defined) {
-    ID *id_curr = lb_array[i]->first;
-
-    if (!id_curr || !BKE_library_id_can_use_idtype(id_curr, GS(id->name))) {
-      continue;
-    }
-
-    for (; id_curr && !is_defined; id_curr = id_curr->next) {
-      if (id_curr == id) {
-        /* We are not interested in self-usages (mostly from drivers or bone constraints...). */
-        continue;
-      }
-      iter.curr_id = id_curr;
-      BKE_library_foreach_ID_link(
-          bmain, id_curr, foreach_libblock_id_users_callback, &iter, IDWALK_READONLY);
-
-      is_defined = ((check_linked ? iter.count_indirect : iter.count_direct) != 0);
-    }
-  }
-
-  return is_defined;
-}
-
-/**
- * Check whether given ID is used locally (i.e. by another non-linked ID).
- */
-bool BKE_library_ID_is_locally_used(Main *bmain, void *idv)
-{
-  return library_ID_is_used(bmain, idv, false);
-}
-
-/**
- * Check whether given ID is used indirectly (i.e. by another linked ID).
- */
-bool BKE_library_ID_is_indirectly_used(Main *bmain, void *idv)
-{
-  return library_ID_is_used(bmain, idv, true);
-}
-
-/**
- * Combine #BKE_library_ID_is_locally_used() and #BKE_library_ID_is_indirectly_used()
- * in a single call.
- */
-void BKE_library_ID_test_usages(Main *bmain, void *idv, bool *is_used_local, bool *is_used_linked)
-{
-  IDUsersIter iter;
-  ListBase *lb_array[MAX_LIBARRAY];
-  ID *id = idv;
-  int i = set_listbasepointers(bmain, lb_array);
-  bool is_defined = false;
-
-  iter.id = id;
-  iter.count_direct = iter.count_indirect = 0;
-  while (i-- && !is_defined) {
-    ID *id_curr = lb_array[i]->first;
-
-    if (!id_curr || !BKE_library_id_can_use_idtype(id_curr, GS(id->name))) {
-      continue;
-    }
-
-    for (; id_curr && !is_defined; id_curr = id_curr->next) {
-      if (id_curr == id) {
-        /* We are not interested in self-usages (mostly from drivers or bone constraints...). */
-        continue;
-      }
-      iter.curr_id = id_curr;
-      BKE_library_foreach_ID_link(
-          bmain, id_curr, foreach_libblock_id_users_callback, &iter, IDWALK_READONLY);
-
-      is_defined = (iter.count_direct != 0 && iter.count_indirect != 0);
-    }
-  }
-
-  *is_used_local = (iter.count_direct != 0);
-  *is_used_linked = (iter.count_indirect != 0);
-}
-
-/* ***** IDs usages.checking/tagging. ***** */
-static int foreach_libblock_used_linked_data_tag_clear_cb(void *user_data,
-                                                          ID *self_id,
-                                                          ID **id_p,
-                                                          int cb_flag)
-{
-  bool *is_changed = user_data;
-
-  if (*id_p) {
-    /* The infamous 'from' pointers (Key.from, Object.proxy_from, ...).
-     * those are not actually ID usage, so we ignore them here. */
-    if (cb_flag & IDWALK_CB_LOOPBACK) {
-      return IDWALK_RET_NOP;
-    }
-
-    /* If checked id is used by an assumed used ID,
-     * then it is also used and not part of any linked archipelago. */
-    if (!(self_id->tag & LIB_TAG_DOIT) && ((*id_p)->tag & LIB_TAG_DOIT)) {
-      (*id_p)->tag &= ~LIB_TAG_DOIT;
-      *is_changed = true;
-    }
-  }
-
-  return IDWALK_RET_NOP;
-}
-
-/**
- * Detect orphaned linked data blocks (i.e. linked data not used (directly or indirectly)
- * in any way by any local data), including complex cases like 'linked archipelagoes', i.e.
- * linked data-blocks that use each other in loops,
- * which prevents their deletion by 'basic' usage checks.
- *
- * \param do_init_tag: if \a true, all linked data are checked, if \a false,
- * only linked data-blocks already tagged with #LIB_TAG_DOIT are checked.
- */
-void BKE_library_unused_linked_data_set_tag(Main *bmain, const bool do_init_tag)
-{
-  ID *id;
-
-  if (do_init_tag) {
-    FOREACH_MAIN_ID_BEGIN (bmain, id) {
-      if (id->lib && (id->tag & LIB_TAG_INDIRECT) != 0) {
-        id->tag |= LIB_TAG_DOIT;
-      }
-      else {
-        id->tag &= ~LIB_TAG_DOIT;
-      }
-    }
-    FOREACH_MAIN_ID_END;
-  }
-
-  for (bool do_loop = true; do_loop;) {
-    do_loop = false;
-    FOREACH_MAIN_ID_BEGIN (bmain, id) {
-      /* We only want to check that ID if it is currently known as used... */
-      if ((id->tag & LIB_TAG_DOIT) == 0) {
-        BKE_library_foreach_ID_link(
-            bmain, id, foreach_libblock_used_linked_data_tag_clear_cb, &do_loop, IDWALK_READONLY);
-      }
-    }
-    FOREACH_MAIN_ID_END;
-  }
-}
-
-/**
- * Untag linked data blocks used by other untagged linked data-blocks.
- * Used to detect data-blocks that we can forcefully make local
- * (instead of copying them to later get rid of original):
- * All data-blocks we want to make local are tagged by caller,
- * after this function has ran caller knows data-blocks still tagged can directly be made local,
- * since they are only used by other data-blocks that will also be made fully local.
- */
-void BKE_library_indirectly_used_data_tag_clear(Main *bmain)
-{
-  ListBase *lb_array[MAX_LIBARRAY];
-
-  bool do_loop = true;
-  while (do_loop) {
-    int i = set_listbasepointers(bmain, lb_array);
-    do_loop = false;
-
-    while (i--) {
-      for (ID *id = lb_array[i]->first; id; id = id->next) {
-        if (id->lib == NULL || id->tag & LIB_TAG_DOIT) {
-          /* Local or non-indirectly-used ID (so far), no need to check it further. */
-          continue;
-        }
-        BKE_library_foreach_ID_link(
-            bmain, id, foreach_libblock_used_linked_data_tag_clear_cb, &do_loop, IDWALK_READONLY);
-      }
-    }
-  }
-}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1a1b66c2de4..a88b804d5b2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2878,7 +2878,7 @@ static void direct_link_id_common(
   }
 
   if (id->uuid) {
-    BLO_read_data_address(fd, &id->uuid);
+    BLO_read_data_address(reader, &id->uuid);
     /* Make sure runtime fields are always zeroed out. */
     BKE_asset_uuid_runtime_reset(id->uuid);
   }
@@ -2887,7 +2887,6 @@ static void direct_link_id_common(
   direct_link_id_embedded_id(reader, current_library, id, id_old);
 }
 
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -9748,13 +9747,12 @@ static BHead *read_libblock(FileData *fd,
 
     if (id->uuid) {
       /* Read all data into fd->datamap. */
-      bhead = read_data_into_oldnewmap(fd, bhead, __func__);
+      bhead = read_data_into_datamap(fd, bhead, __func__);
 
       id->uuid = newdataadr(fd, id->uuid);
       /* Make sure runtime fields are always zeroed out. */
       BKE_asset_uuid_runtime_reset(id->uuid);
 
-      oldnewmap_free_unused(fd->datamap);
       oldnewmap_clear(fd->datamap);
       return bhead;
     }
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index eeb7a867136..84c17a7ceb7 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -737,7 +737,7 @@ static void write_iddata(BlendWriter *writer, ID *id)
     IDP_WriteProperty(id->properties, writer);
   }
   if (id->uuid) {
-    writestruct(wd, DATA, AssetUUID, 1, id->uuid);
+    BLO_write_struct(writer, AssetUUID, id->uuid);
   }
 
   if (id->override_library) {
@@ -4019,7 +4019,7 @@ static void write_libraries(WriteData *wd, Main *main)
              * the whole asset info would be completely lost when reloading the linked data-block,
              * especially in case it is not immediately found and needs to go through the whole
              * 'asset engine update' process after main .blend read process is finished. */
-            write_iddata(wd, id);
+            write_iddata(&writer, id);
           }
         }
       }
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c
index 0b2b64a779e..bd194a6293d 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.c
+++ b/source/blender/python/intern/bpy_rna_id_collection.c
@@ -29,8 +29,8 @@
 #include "BLI_utildefines.h"
 
 #include "RNA_access.h"
-#include "RNA_types.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "BKE_asset_engine.h"
 #include "BKE_global.h"
@@ -488,16 +488,6 @@ static PyObject *bpy_orphans_purge(PyObject *UNUSED(self),
 
   Py_INCREF(Py_None);
 
-  static PyMethodDef asset_uuid_search = {
-      "asset_uuid_search",
-      (PyCFunction)bpy_asset_uuid_search,
-      METH_VARARGS | METH_KEYWORDS,
-      bpy_asset_uuid_search_doc,
-  };
-
-  PyModule_AddObject(
-      mod_par, "_rna_id_collection_asset_uuid_search", PyCFunction_New(&asset_uuid_search, NULL));
-
   return Py_None;
 }
 
@@ -519,3 +509,9 @@ PyMethodDef BPY_rna_id_collection_orphans_purge_method_def = {
     METH_STATIC | METH_VARARGS | METH_KEYWORDS,
     bpy_orphans_purge_doc,
 };
+PyMethodDef BPY_rna_id_collection_asset_uuid_search_method_def = {
+    "asset_uuid_search",
+    (PyCFunction)bpy_asset_uuid_search,
+    METH_STATIC | METH_VARARGS | METH_KEYWORDS,
+    bpy_asset_uuid_search_doc,
+};
diff --git a/source/blender/python/intern/bpy_rna_id_collection.h b/source/blender/python/intern/bpy_rna_id_collection.h
index ee8f4c666a8..9d8bd67b211 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.h
+++ b/source/blender/python/intern/bpy_rna_id_collection.h
@@ -24,5 +24,6 @@
 extern PyMethodDef BPY_rna_id_collection_user_map_method_def;
 extern PyMethodDef BPY_rna_id_collection_batch_remove_method_def;
 extern PyMethodDef BPY_rna_id_collection_orphans_purge_method_def;
+extern PyMethodDef BPY_rna_id_collection_asset_uuid_search_method_def;
 
 #endif /* __BPY_RNA_ID_COLLECTION_H__ */
diff --git a/source/blender/python/intern/bpy_rna_types_capi.c b/source/blender/python/intern/bpy_rna_types_capi.c
index 5a2ba4a5cdb..477f1e98d7b 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.c
+++ b/source/blender/python/intern/bpy_rna_types_capi.c
@@ -55,6 +55,7 @@ static struct PyMethodDef pyrna_blenddata_methods[] = {
     {NULL, NULL, 0, NULL}, /* #BPY_rna_id_collection_user_map_method_def */
     {NULL, NULL, 0, NULL}, /* #BPY_rna_id_collection_batch_remove_method_def */
     {NULL, NULL, 0, NULL}, /* #BPY_rna_id_collection_orphans_purge_method_def */
+    {NULL, NULL, 0, NULL}, /* #BPY_rna_id_collection_asset_uuid_search_method_def */
     {NULL, NULL, 0, NULL},
 };
 
@@ -195,8 +196,9 @@ void BPY_rna_types_extend_capi(void)
   ARRAY_SET_ITEMS(pyrna_blenddata_methods,
                   BPY_rna_id_collection_user_map_method_def,
                   BPY_rna_id_collection_batch_remove_method_def,
-                  BPY_rna_id_collection_orphans_purge_method_def);
-  BLI_assert(ARRAY_SIZE(pyrna_blenddata_methods) == 4);
+                  BPY_rna_id_collection_orphans_purge_method_def,
+                  BPY_rna_id_collection_asset_uuid_search_method_def);
+  BLI_assert(ARRAY_SIZE(pyrna_blenddata_methods) == 5);
   pyrna_struct_type_extend_capi(&RNA_BlendData, pyrna_blenddata_methods, NULL);
 
   /* BlendDataLibraries */