diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_dynamicpaint.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index a45cb21139c..c7386f947ce 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -99,8 +99,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; @@ -137,8 +138,9 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static void foreachIDLink(ModifierData *md, Object *ob, - IDWalkFunc walk, void *userData) +static void foreachIDLink( + ModifierData *md, Object *ob, + IDWalkFunc walk, void *userData) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; @@ -155,8 +157,9 @@ static void foreachIDLink(ModifierData *md, Object *ob, } } -static void foreachTexLink(ModifierData *UNUSED(md), Object *UNUSED(ob), - TexWalkFunc UNUSED(walk), void *UNUSED(userData)) +static void foreachTexLink( + ModifierData *UNUSED(md), Object *UNUSED(ob), + TexWalkFunc UNUSED(walk), void *UNUSED(userData)) { //walk(userData, ob, md, ""); /* re-enable when possible */ } |