From 1e736d8a95b2e96e4a4f072f75711ab9522ea0e7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 20 Aug 2021 15:08:27 +1000 Subject: Cleanup: rename BKE_mesh_free -> BKE_mesh_free_data It wasn't obvious this didn't free the memory of the mesh it's self leading to memory leaks. --- source/blender/blenkernel/BKE_mesh.h | 2 +- source/blender/blenkernel/intern/mesh.c | 4 ++-- source/blender/editors/mesh/editmesh_knife_project.c | 2 +- source/blender/editors/mesh/editmesh_undo.c | 2 +- source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 22ce197088a..edf68f2b16f 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -95,7 +95,7 @@ void BKE_mesh_looptri_get_real_edges(const struct Mesh *mesh, const struct MLoopTri *looptri, int r_edges[3]); -void BKE_mesh_free(struct Mesh *me); +void BKE_mesh_free_data(struct Mesh *me); void BKE_mesh_clear_geometry(struct Mesh *me); struct Mesh *BKE_mesh_add(struct Main *bmain, const char *name); void BKE_mesh_copy_settings(struct Mesh *me_dst, const struct Mesh *me_src); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index d5270f9e347..09efc1e0379 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -793,7 +793,7 @@ bool BKE_mesh_has_custom_loop_normals(Mesh *me) } /** Free (or release) any data used by this mesh (does not free the mesh itself). */ -void BKE_mesh_free(Mesh *me) +void BKE_mesh_free_data(Mesh *me) { mesh_free_data(&me->id); } @@ -987,7 +987,7 @@ void BKE_mesh_eval_delete(struct Mesh *mesh_eval) { /* Evaluated mesh may point to edit mesh, but never owns it. */ mesh_eval->edit_mesh = NULL; - BKE_mesh_free(mesh_eval); + BKE_mesh_free_data(mesh_eval); BKE_libblock_free_data(&mesh_eval->id, false); MEM_freeN(mesh_eval); } diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c index aa144dd3f3c..cebc2a445aa 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.c +++ b/source/blender/editors/mesh/editmesh_knife_project.c @@ -113,7 +113,7 @@ static LinkNode *knifeproject_poly_from_object(const bContext *C, BKE_nurbList_free(&nurbslist); if (me_eval_needs_free) { - BKE_mesh_free(me_eval); + BKE_mesh_free_data((struct Mesh *)me_eval); } } diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 79385e28aa9..83e9302d31d 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -695,7 +695,7 @@ static void undomesh_free_data(UndoMesh *um) MEM_freeN(me->key); } - BKE_mesh_free(me); + BKE_mesh_free_data(me); } static Object *editmesh_object_from_context(bContext *C) diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index 805c864566a..9d3b0730b79 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -1496,7 +1496,7 @@ static void lineart_geometry_object_load(Depsgraph *dg, #define LRT_MESH_FINISH \ BM_mesh_free(bm); \ if (ob->type != OB_MESH) { \ - BKE_mesh_free(use_mesh); \ + BKE_mesh_free_data(use_mesh); \ MEM_freeN(use_mesh); \ } -- cgit v1.2.3