diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-27 19:21:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-27 23:17:06 +0300 |
| commit | b4087ea6392e051fd9e4f7ee5207d089a044e15e (patch) | |
| tree | 164c0d165af06bd6257dc003e1164fe226e6ac89 /source/blender/modifiers/intern/MOD_wave.c | |
| parent | 4543da6ca63d227ed9ad809fbbdd765acab7aba6 (diff) | |
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.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wave.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_wave.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |