diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-09-02 08:39:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-09-02 09:12:24 +0300 |
commit | a8739ae6c2acbf0737113fbebf7e5ac0a942aaee (patch) | |
tree | 8ffccedde5a807780d0d3e988953aa75ceffa43d /source/blender/blenkernel/intern/editmesh.c | |
parent | a2f3aca6470b9a7f211ff95c5f3efeb7f62cb9f4 (diff) |
Fix regression in recent change 0708733c46cb6b50697c1b80a6541d6fb410267e
Adding a mirror modifier in edit-mode crashed.
Freeing meshes that hold a shallow copy happens in multiple places
while calculating modifiers, making it impractical to clear the
edit-mode pointer before freeing the mesh (as done in
BKE_editmesh_free_derived_caches).
Add a struct member to the edit-mesh struct so evaluated copies
don't free the edit-mesh contents.
Diffstat (limited to 'source/blender/blenkernel/intern/editmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index e178b0c42d0..83e03ef44f5 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -211,14 +211,10 @@ void BKE_editmesh_looptri_and_normals_calc_with_partial(BMEditMesh *em, void BKE_editmesh_free_derived_caches(BMEditMesh *em) { if (em->mesh_eval_cage) { - Mesh *me = em->mesh_eval_cage; - me->edit_mesh = NULL; - BKE_id_free(NULL, me); + BKE_id_free(NULL, em->mesh_eval_cage); } if (em->mesh_eval_final && em->mesh_eval_final != em->mesh_eval_cage) { - Mesh *me = em->mesh_eval_final; - me->edit_mesh = NULL; - BKE_id_free(NULL, me); + BKE_id_free(NULL, em->mesh_eval_final); } em->mesh_eval_cage = em->mesh_eval_final = NULL; |