diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-20 13:33:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-21 14:56:22 +0300 |
| commit | cfb7565cd5c19e80089d82d7034393342a24f696 (patch) | |
| tree | 78fa4a4a73e5b61e6b7cd5626967a836e2ed9628 /source/blender/modifiers/intern/MOD_smoke.c | |
| parent | 91a5b665b0b47a20e65434dd40740a80b39a0b9c (diff) | |
Cleanup: convert smoke modifier from DerivedMesh to Mesh.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smoke.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 0caeda0e426..b91358a8ab6 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -105,22 +105,20 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static DerivedMesh *applyModifier_DM( +static Mesh *applyModifier( ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) + Mesh *me) { SmokeModifierData *smd = (SmokeModifierData *) md; if (ctx->flag & MOD_APPLY_ORCO) { - return dm; + return me; } Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); - return smokeModifier_do(smd, ctx->depsgraph, scene, ctx->object, dm); + return smokeModifier_do(smd, ctx->depsgraph, scene, ctx->object, me); } -applyModifier_DM_wrapper(applyModifier, applyModifier_DM) - static bool dependsOnTime(ModifierData *UNUSED(md)) { return true; |