[Bf-blender-cvs] [a2f3aca6470] master: Cleanup: remove redundant edit-mesh memory allocation
Campbell Barton
noreply at git.blender.org
Thu Sep 2 07:32:48 CEST 2021
Commit: a2f3aca6470b9a7f211ff95c5f3efeb7f62cb9f4
Author: Campbell Barton
Date: Thu Sep 2 15:29:37 2021 +1000
Branches: master
https://developer.blender.org/rBa2f3aca6470b9a7f211ff95c5f3efeb7f62cb9f4
Cleanup: remove redundant edit-mesh memory allocation
This memory was only duplicated to satisfy mesh_data_free
which was incorrectly freeing the pointer (but nothing else).
===================================================================
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/mesh_wrapper.c
===================================================================
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index a925dfa4da8..e178b0c42d0 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -212,12 +212,12 @@ void BKE_editmesh_free_derived_caches(BMEditMesh *em)
{
if (em->mesh_eval_cage) {
Mesh *me = em->mesh_eval_cage;
- MEM_SAFE_FREE(me->edit_mesh);
+ me->edit_mesh = NULL;
BKE_id_free(NULL, me);
}
if (em->mesh_eval_final && em->mesh_eval_final != em->mesh_eval_cage) {
Mesh *me = em->mesh_eval_final;
- MEM_SAFE_FREE(me->edit_mesh);
+ me->edit_mesh = NULL;
BKE_id_free(NULL, me);
}
em->mesh_eval_cage = em->mesh_eval_final = NULL;
diff --git a/source/blender/blenkernel/intern/mesh_wrapper.c b/source/blender/blenkernel/intern/mesh_wrapper.c
index fe6af432314..de7259757bf 100644
--- a/source/blender/blenkernel/intern/mesh_wrapper.c
+++ b/source/blender/blenkernel/intern/mesh_wrapper.c
@@ -69,7 +69,7 @@ Mesh *BKE_mesh_wrapper_from_editmesh_with_coords(BMEditMesh *em,
/* Use edit-mesh directly where possible. */
me->runtime.is_original = true;
- me->edit_mesh = MEM_dupallocN(em);
+ me->edit_mesh = em;
/* Make sure, we crash if these are ever used. */
#ifdef DEBUG
More information about the Bf-blender-cvs
mailing list