From 52a5c80313c206eb7c1b31af3079bffdda4b09c6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 12 Aug 2022 21:45:21 +1000 Subject: Fix T100191: Crash with the wave modifier using normals in edit-mode --- source/blender/modifiers/intern/MOD_wave.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 863656b85a5..0fe023687c2 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -340,8 +340,12 @@ static void deformVertsEM(ModifierData *md, Mesh *mesh_src = NULL; if (wmd->flag & MOD_WAVE_NORM) { + /* NOTE(@campbellbarton): don't request normals here because `use_normals == false` + * because #BKE_mesh_wrapper_ensure_mdata has not run yet. + * While this could be supported the argument is documented to be removed, + * so pass false here and let the normals be created when requested. */ mesh_src = MOD_deform_mesh_eval_get( - ctx->object, editData, mesh, vertexCos, numVerts, true, false); + ctx->object, editData, mesh, vertexCos, numVerts, false, false); } else if (wmd->texture != NULL || wmd->defgrp_name[0] != '\0') { mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false); @@ -355,6 +359,12 @@ static void deformVertsEM(ModifierData *md, waveModifier_do(wmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); if (!ELEM(mesh_src, NULL, mesh)) { + /* Important not to free `vertexCos` owned by the caller. */ + EditMeshData *edit_data = mesh_src->runtime.edit_data; + if (edit_data->vertexCos == vertexCos) { + edit_data->vertexCos = NULL; + } + BKE_id_free(NULL, mesh_src); } } -- cgit v1.2.3