diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-14 23:24:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-15 13:09:16 +0300 |
| commit | 01029c68d293593ccf5019793a5b577b3b522338 (patch) | |
| tree | dc20ca94733d0ea4cfc4df7da87656e54ab641c0 /source/blender/blenkernel | |
| parent | f55a178db06d6c3bf06ae8c33525d6d1c48c9572 (diff) | |
Cleanup: rename BKE_libblock_delete to BKE_id_delete.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_library.h | 11 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/collection.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 4d96c271785..d03834d2995 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -140,23 +140,22 @@ enum { LIB_ID_FREE_NO_UI_USER = 1 << 9, /* Do not attempt to remove freed ID from UI data/notifiers/... */ }; +void BKE_libblock_free_datablock(struct ID *id, const int flag) ATTR_NONNULL(); +void BKE_libblock_free_data(struct ID *id, const bool do_id_user) ATTR_NONNULL(); + void BKE_id_free_ex(struct Main *bmain, void *idv, int flag, const bool use_flag_from_idtag); void BKE_id_free(struct Main *bmain, void *idv); void BKE_id_free_us(struct Main *bmain, void *idv) ATTR_NONNULL(); +void BKE_id_delete(struct Main *bmain, void *idv) ATTR_NONNULL(); + void BKE_libblock_management_main_add(struct Main *bmain, void *idv); void BKE_libblock_management_main_remove(struct Main *bmain, void *idv); void BKE_libblock_management_usercounts_set(struct Main *bmain, void *idv); void BKE_libblock_management_usercounts_clear(struct Main *bmain, void *idv); -/* TODO should be named "BKE_id_delete()". */ -void BKE_libblock_delete(struct Main *bmain, void *idv) ATTR_NONNULL(); - -void BKE_libblock_free_datablock(struct ID *id, const int flag) ATTR_NONNULL(); -void BKE_libblock_free_data(struct ID *id, const bool do_id_user) ATTR_NONNULL(); - void BKE_id_lib_local_paths(struct Main *bmain, struct Library *lib, struct ID *id); void id_lib_extern(struct ID *id); void BKE_library_filepath_set(struct Main *bmain, struct Library *lib, const char *filepath); diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index d75274d4daa..a8809de0431 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -476,7 +476,7 @@ void BKE_blendfile_read_make_empty(bContext *C) continue; } while ((id = lbarray[a]->first)) { - BKE_libblock_delete(bmain, id); + BKE_id_delete(bmain, id); } } } diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index e8e3b9229b6..5f4d57d9c5c 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -173,7 +173,7 @@ bool BKE_collection_delete(Main *bmain, Collection *collection, bool hierarchy) } } - BKE_libblock_delete(bmain, collection); + BKE_id_delete(bmain, collection); BKE_main_collection_sync(bmain); diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index cc7967a9bdd..39d7b690447 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -946,7 +946,7 @@ void BKE_id_free_us(Main *bmain, void *idv) /* test users */ } } -void BKE_libblock_delete(Main *bmain, void *idv) +void BKE_id_delete(Main *bmain, void *idv) { ListBase *lbarray[MAX_LIBARRAY]; int base_count, i; |