diff options
-rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 0e54cbc76fc..0eb8df1b19d 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -134,7 +134,7 @@ struct IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void IDP_FreeProperty_ex(struct IDProperty *prop, const bool do_id_user); +void IDP_FreePropertyContent_ex(struct IDProperty *prop, const bool do_id_user); void IDP_FreePropertyContent(struct IDProperty *prop); void IDP_FreeProperty(struct IDProperty *prop); diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index c62b7454e67..016da52252a 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -121,7 +121,7 @@ static void IDP_FreeIDPArray(IDProperty *prop, const bool do_id_user) BLI_assert(prop->type == IDP_IDPARRAY); for (i = 0; i < prop->len; i++) { - IDP_FreeProperty_ex(GETPROP(prop, i), do_id_user); + IDP_FreePropertyContent_ex(GETPROP(prop, i), do_id_user); } if (prop->data.pointer) { @@ -740,7 +740,7 @@ static void IDP_FreeGroup(IDProperty *prop, const bool do_id_user) BLI_assert(prop->type == IDP_GROUP); for (loop = prop->data.group.first; loop; loop = loop->next) { - IDP_FreeProperty_ex(loop, do_id_user); + IDP_FreePropertyContent_ex(loop, do_id_user); } BLI_freelistN(&prop->data.group); } @@ -1057,7 +1057,7 @@ IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char * * \note This will free allocated data, all child properties of arrays and groups, and unlink IDs! * But it does not free the actual IDProperty struct itself. */ -void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user) +void IDP_FreePropertyContent_ex(IDProperty *prop, const bool do_id_user) { switch (prop->type) { case IDP_ARRAY: @@ -1082,7 +1082,7 @@ void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user) void IDP_FreePropertyContent(IDProperty *prop) { - IDP_FreeProperty_ex(prop, true); + IDP_FreePropertyContent_ex(prop, true); } void IDP_FreeProperty(IDProperty *prop) diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 3b6f11935d1..4e5eac7924b 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -740,7 +740,7 @@ void BKE_libblock_relink_to_newid(ID *id) void BKE_libblock_free_data(ID *id, const bool do_id_user) { if (id->properties) { - IDP_FreeProperty_ex(id->properties, do_id_user); + IDP_FreePropertyContent_ex(id->properties, do_id_user); MEM_freeN(id->properties); } diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 52828205b2d..b7db434e234 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -787,7 +787,7 @@ static void node_socket_free(bNodeTree *UNUSED(ntree), const bool do_id_user) { if (sock->prop) { - IDP_FreeProperty_ex(sock->prop, do_id_user); + IDP_FreePropertyContent_ex(sock->prop, do_id_user); MEM_freeN(sock->prop); } @@ -1850,7 +1850,7 @@ static void node_free_node(bNodeTree *ntree, bNode *node) if (node->prop) { /* Remember, no ID user refcount management here! */ - IDP_FreeProperty_ex(node->prop, false); + IDP_FreePropertyContent_ex(node->prop, false); MEM_freeN(node->prop); } diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 7f738ff4e4f..99536b979b6 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -262,7 +262,7 @@ static void BKE_sequence_free_ex(Scene *scene, } if (seq->prop) { - IDP_FreeProperty_ex(seq->prop, do_id_user); + IDP_FreePropertyContent_ex(seq->prop, do_id_user); MEM_freeN(seq->prop); } diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index e082e961b45..76b88b8df22 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -976,7 +976,7 @@ static void shader_preview_free(void *customdata) /* get rid of copied ID */ properties = IDP_GetProperties(sp->id_copy, false); if (properties) { - IDP_FreeProperty_ex(properties, false); + IDP_FreePropertyContent_ex(properties, false); MEM_freeN(properties); } switch (GS(sp->id_copy->name)) { |