diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-08-23 09:24:11 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-08-23 09:24:11 +0300 |
| commit | e41a8d57d4249511b6d4e14bdd2352d1d2e5caec (patch) | |
| tree | 56bb2d592fff3e3519a882da5446a85cfccd59a2 | |
| parent | e291f482ef0325e5de1708f9954bdf04327e153f (diff) | |
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.
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife_project.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index f14b9a30d99..bb6170b9e71 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -102,7 +102,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); struct Mesh *BKE_mesh_copy(struct Main *bmain, const struct Mesh *me); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 2a86b899290..085da9a84f5 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -583,7 +583,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); } @@ -779,7 +779,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 25cdf3caf11..724227947b4 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(me_eval); } } diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 48ec41027ff..9d18db9899f 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -667,7 +667,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) |