archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: convert smoke modifier from DerivedMesh to Mesh.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-20 12:33:45 +02:00
parent 91a5b665b0
commit cfb7565cd5
10 changed files with 118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/modifiers/intern/MOD_smoke.c
View File

@@ -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;