diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-08-11 09:09:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-08-11 09:09:23 +0300 |
commit | 18fbcaf7b9273cc4a7e153fea60a53fec956d600 (patch) | |
tree | c5ad617dee655fc9fe9d9e02bbf32121bb5e16e7 /source/blender/blenkernel | |
parent | 2f39f7f81549cff0285c2f1934de5d2c743785d4 (diff) |
Cleanup: rename BKE_collection_{free => free_data}
This function doesn't free the collection, only it's memory.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_collection.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index 8b8d0f7b107..2c7143be60e 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -65,7 +65,7 @@ void BKE_collection_add_from_collection(struct Main *bmain, struct Scene *scene, struct Collection *collection_src, struct Collection *collection_dst); -void BKE_collection_free(struct Collection *collection); +void BKE_collection_free_data(struct Collection *collection); bool BKE_collection_delete(struct Main *bmain, struct Collection *collection, bool hierarchy); struct Collection *BKE_collection_duplicate(struct Main *bmain, diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index dbcd80fe065..b62e33ff564 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -508,7 +508,7 @@ void BKE_collection_add_from_collection(Main *bmain, * \{ */ /** Free (or release) any data used by this collection (does not free the collection itself). */ -void BKE_collection_free(Collection *collection) +void BKE_collection_free_data(Collection *collection) { BKE_libblock_free_data(&collection->id, false); collection_free_data(&collection->id); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 9dab276af95..c55185c0f2a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -445,7 +445,7 @@ static void scene_free_data(ID *id) * for objects directly in the master collection? then other * collections in the scene need to do it too? */ if (scene->master_collection) { - BKE_collection_free(scene->master_collection); + BKE_collection_free_data(scene->master_collection); MEM_freeN(scene->master_collection); scene->master_collection = NULL; } |