diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 15:05:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 15:05:00 +0300 |
| commit | 6e860bef2885ea9f5aec3016e90c7557fc80aa01 (patch) | |
| tree | 0c94fb42e7244656ea7b7ab6637b2226e8bdacff /source/blender/modifiers/intern/MOD_fluidsim.c | |
| parent | cc05b661f7685ba5b9b046c5fed0cf45ea176d20 (diff) | |
| parent | df045206021bdd448482f9d022f73029d28f7fc3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 75f57de2a37..27ff1445176 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -103,24 +103,20 @@ static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationConte return result ? result : dm; } -static void updateDepsgraph(ModifierData *md, - struct Main *UNUSED(bmain), - struct Scene *scene, - Object *ob, - struct DepsNodeHandle *node) +static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx) { FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; if (fluidmd && fluidmd->fss) { if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) { - FOREACH_SCENE_OBJECT(scene, ob1) + FOREACH_SCENE_OBJECT(ctx->scene, ob1) { - if (ob1 != ob) { + if (ob1 != ctx->object) { FluidsimModifierData *fluidmdtmp = (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim); /* Only put dependencies from NON-DOMAIN fluids in here. */ if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) { - DEG_add_object_relation(node, ob1, DEG_OB_COMP_TRANSFORM, "Fluidsim Object"); + DEG_add_object_relation(ctx->node, ob1, DEG_OB_COMP_TRANSFORM, "Fluidsim Object"); } } } |