diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 18:33:04 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 19:02:17 +0300 |
| commit | 334b55fd2e89d66023a499e1ce7f867d9789290d (patch) | |
| tree | 3afcc711d6a9eeda85d9ae069ce1ac9cfc9fcb89 /source/blender/modifiers/intern/MOD_wave.c | |
| parent | 6b9f1ffe6e56ee4d55f4cde5c724c31a3a90292b (diff) | |
Extract common modifier parameters into ModifierEvalContext struct
The contents of the ModifierEvalContext struct are constant while iterating
over the modifier stack. The struct thus should be only created once, outside
any loop over the modifiers.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wave.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_wave.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index e3bed600349..c5af7755578 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -302,40 +302,39 @@ static void waveModifier_do(WaveModifierData *md, if (wmd->texture) MEM_freeN(tex_co); } -static void deformVerts(ModifierData *md, struct Depsgraph *depsgraph, - Object *ob, DerivedMesh *derivedData, +static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, float (*vertexCos)[3], - int numVerts, - ModifierApplyFlag UNUSED(flag)) + int numVerts) { DerivedMesh *dm = derivedData; WaveModifierData *wmd = (WaveModifierData *)md; if (wmd->flag & MOD_WAVE_NORM) - dm = get_cddm(ob, NULL, dm, vertexCos, false); + dm = get_cddm(ctx->object, NULL, dm, vertexCos, false); else if (wmd->texture || wmd->defgrp_name[0]) - dm = get_dm(ob, NULL, dm, NULL, false, false); + dm = get_dm(ctx->object, NULL, dm, NULL, false, false); - waveModifier_do(wmd, depsgraph, ob, dm, vertexCos, numVerts); + waveModifier_do(wmd, ctx->depsgraph, ctx->object, dm, vertexCos, numVerts); if (dm != derivedData) dm->release(dm); } static void deformVertsEM( - ModifierData *md, struct Depsgraph *depsgraph, - Object *ob, struct BMEditMesh *editData, + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { DerivedMesh *dm = derivedData; WaveModifierData *wmd = (WaveModifierData *)md; if (wmd->flag & MOD_WAVE_NORM) - dm = get_cddm(ob, editData, dm, vertexCos, false); + dm = get_cddm(ctx->object, editData, dm, vertexCos, false); else if (wmd->texture || wmd->defgrp_name[0]) - dm = get_dm(ob, editData, dm, NULL, false, false); + dm = get_dm(ctx->object, editData, dm, NULL, false, false); - waveModifier_do(wmd, depsgraph, ob, dm, vertexCos, numVerts); + waveModifier_do(wmd, ctx->depsgraph, ctx->object, dm, vertexCos, numVerts); if (dm != derivedData) dm->release(dm); |