diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_library.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index afe13b24f3f..855eb10976c 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -68,7 +68,6 @@ void BKE_libblock_free(struct Main *bmain, void *idv) ATTR_NONNULL(); void BKE_libblock_free_ex(struct Main *bmain, void *idv, const bool do_id_user, const bool do_ui_user) ATTR_NONNULL(); void BKE_libblock_free_us(struct Main *bmain, void *idv) ATTR_NONNULL(); void BKE_libblock_free_data(struct Main *bmain, struct ID *id) ATTR_NONNULL(); -void BKE_libblock_free_data_ex(struct Main *bmain, struct ID *id, const bool do_id_user) ATTR_NONNULL(); void BKE_libblock_delete(struct Main *bmain, void *idv) ATTR_NONNULL(); void BKE_id_lib_local_paths(struct Main *bmain, struct Library *lib, struct ID *id); diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 4133342f3f2..4e5ece1fde5 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -691,20 +691,10 @@ static void animdata_dtar_clear_cb(ID *UNUSED(id), AnimData *adt, void *userdata void BKE_libblock_free_data(Main *bmain, ID *id) { - BKE_libblock_free_data_ex(bmain, id, true); -} - -void BKE_libblock_free_data_ex(Main *bmain, ID *id, const bool do_id_user) -{ if (id->properties) { IDP_FreeProperty(id->properties); MEM_freeN(id->properties); } - - if (do_id_user) { - /* this ID may be a driver target! */ - BKE_animdata_main_cb(bmain, animdata_dtar_clear_cb, (void *)id); - } } /** @@ -852,7 +842,7 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const b BLI_remlink(lb, id); - BKE_libblock_free_data_ex(bmain, id, do_id_user); + BKE_libblock_free_data(bmain, id); BKE_main_unlock(bmain); MEM_freeN(id); |