diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
| commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
| tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/modifiers/intern/MOD_weightvgmix.c | |
| parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) | |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgmix.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgmix.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index e509d1464f2..368a6b46c7e 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -64,10 +64,12 @@ static float mix_weight(float weight, float weight2, char mix_mode) return (weight * weight2); case MOD_WVG_MIX_DIV: /* Avoid dividing by zero (or really small values). */ - if (0.0 <= weight2 < MOD_WVG_ZEROFLOOR) + if (0.0 <= weight2 < MOD_WVG_ZEROFLOOR) { weight2 = MOD_WVG_ZEROFLOOR; - else if (-MOD_WVG_ZEROFLOOR < weight2) + } + else if (-MOD_WVG_ZEROFLOOR < weight2) { weight2 = -MOD_WVG_ZEROFLOOR; + } return (weight / weight2); case MOD_WVG_MIX_DIF: return (weight < weight2 ? weight2 - weight : weight - weight2); @@ -401,8 +403,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes /* If weight preview enabled... */ #if 0 /* XXX Currently done in mod stack :/ */ - if (do_prev) + if (do_prev) { DM_update_weight_mcol(ob, dm, 0, org_w, numIdx, indices); + } #endif /* Freeing stuff. */ |