From 0708733c46cb6b50697c1b80a6541d6fb410267e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 Sep 2021 15:29:34 +1000 Subject: Fix T91123: Freeing meshes in edit-mode leaks memory Freeing the edit-mesh pointer wasn't free the edit-mesh data it's self. Unlinking from the outliner or through the Python API leaked memory. This didn't often cause leaks in practice since ED_editors_exit exits edit-mode for all objects. Now freeing mesh data frees the edit-mode data as well, this matches the behavior of other object types that support edit-mode. --- source/blender/blenkernel/intern/editmesh.c | 8 ++++++-- source/blender/blenkernel/intern/mesh.c | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 83e03ef44f5..a925dfa4da8 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -211,10 +211,14 @@ void BKE_editmesh_looptri_and_normals_calc_with_partial(BMEditMesh *em, void BKE_editmesh_free_derived_caches(BMEditMesh *em) { if (em->mesh_eval_cage) { - BKE_id_free(NULL, em->mesh_eval_cage); + Mesh *me = em->mesh_eval_cage; + MEM_SAFE_FREE(me->edit_mesh); + BKE_id_free(NULL, me); } if (em->mesh_eval_final && em->mesh_eval_final != em->mesh_eval_cage) { - BKE_id_free(NULL, em->mesh_eval_final); + Mesh *me = em->mesh_eval_final; + MEM_SAFE_FREE(me->edit_mesh); + BKE_id_free(NULL, me); } em->mesh_eval_cage = em->mesh_eval_final = NULL; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index bfc05c2d624..daff82802f9 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -160,6 +160,12 @@ static void mesh_free_data(ID *id) BLI_freelistN(&mesh->vertex_group_names); + if (mesh->edit_mesh) { + BKE_editmesh_free_data(mesh->edit_mesh); + MEM_freeN(mesh->edit_mesh); + mesh->edit_mesh = NULL; + } + BKE_mesh_runtime_clear_cache(mesh); mesh_clear_geometry(mesh); MEM_SAFE_FREE(mesh->mat); -- cgit v1.2.3