diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
| commit | 1ff373ef5bb0c1462ad8b0f30cfb773e30cbb2bb (patch) | |
| tree | b6ec7b01b644cc8c0d4d743a4d3d94551b59f2b1 /source/blender/modifiers/intern/MOD_warp.c | |
| parent | 594b0298c7a672fca44890d3afd1e5bf4f06c1da (diff) | |
| parent | 2636be0ac0d3139b2c9cf54f6380b2e9a3d3ed51 (diff) | |
svn merge -r40166:40279 ^/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_warp.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index e6e9c347e6d..8eb1bace229 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -232,8 +232,8 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob, dv = &dvert[i]; if(dv) { - weight = defvert_find_weight(dv, defgrp_index) * wmd->strength; - if(weight <= 0.0f) + weight = defvert_find_weight(dv, defgrp_index) * strength; + if(weight <= 0.0f) /* Should never occure... */ continue; } } |