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_displace.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_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 10365aae607..7a715c9290c 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -368,15 +368,14 @@ static void displaceModifier_do( } } -static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(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 = get_cddm(ob, NULL, derivedData, vertexCos, dependsOnNormals(md)); + DerivedMesh *dm = get_cddm(ctx->object, NULL, derivedData, vertexCos, dependsOnNormals(md)); - displaceModifier_do((DisplaceModifierData *)md, ob, dm, + displaceModifier_do((DisplaceModifierData *)md, ctx->object, dm, vertexCos, numVerts); if (dm != derivedData) @@ -384,12 +383,12 @@ static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), } static void deformVertsEM( - ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, struct BMEditMesh *editData, + ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { - DerivedMesh *dm = get_cddm(ob, editData, derivedData, vertexCos, dependsOnNormals(md)); + DerivedMesh *dm = get_cddm(ctx->object, editData, derivedData, vertexCos, dependsOnNormals(md)); - displaceModifier_do((DisplaceModifierData *)md, ob, dm, + displaceModifier_do((DisplaceModifierData *)md, ctx->object, dm, vertexCos, numVerts); if (dm != derivedData) |