From b4087ea6392e051fd9e4f7ee5207d089a044e15e Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 27 Nov 2018 17:21:16 +0100 Subject: Modifiers: Refactor `MOD_deform_mesh_eval_get()` helper a bit. Now that function also takes expected number of vertices, and do the checks against generated mesh internally. --- source/blender/modifiers/intern/MOD_wave.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_wave.c') diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index ea09b6400cf..9f864063c7b 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -308,9 +308,9 @@ static void deformVerts( WaveModifierData *wmd = (WaveModifierData *)md; if (wmd->flag & MOD_WAVE_NORM) - mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, vertexCos, true, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, vertexCos, numVerts, true, false); else if (wmd->texture || wmd->defgrp_name[0]) - mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false); waveModifier_do(wmd, ctx->depsgraph, ctx->object, mesh_src, vertexCos, numVerts); @@ -327,9 +327,9 @@ static void deformVertsEM( WaveModifierData *wmd = (WaveModifierData *)md; if (wmd->flag & MOD_WAVE_NORM) - mesh_src = MOD_get_mesh_eval(ctx->object, editData, mesh, vertexCos, true, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, vertexCos, numVerts, true, false); else if (wmd->texture || wmd->defgrp_name[0]) - mesh_src = MOD_get_mesh_eval(ctx->object, editData, mesh, NULL, false, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false); waveModifier_do(wmd, ctx->depsgraph, ctx->object, mesh_src, vertexCos, numVerts); -- cgit v1.2.3