diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 03:27:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:10 +0300 |
| commit | 2e348fd43ee2bc7285fe4461171d51f307dabf92 (patch) | |
| tree | 7e12478710dc214033b2d3e724d48ab4e2b758b5 /source/blender/blenkernel/intern/constraint.c | |
| parent | bc8504cb4c93eb3aac22222f62966c13560a2bf6 (diff) | |
Cleanup: shadowing (blenkernel)
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 85383cc8cf1..ec3dd9272e1 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2730,8 +2730,8 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t float hard = min_ff(bulge, bulge_max); float range = bulge_max - 1.0f; - float scale = (range > 0.0f) ? 1.0f / range : 0.0f; - float soft = 1.0f + range * atanf((bulge - 1.0f) * scale) / (float)M_PI_2; + float scale_fac = (range > 0.0f) ? 1.0f / range : 0.0f; + float soft = 1.0f + range * atanf((bulge - 1.0f) * scale_fac) / (float)M_PI_2; bulge = interpf(soft, hard, data->bulge_smooth); } @@ -2742,8 +2742,8 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t float hard = max_ff(bulge, bulge_min); float range = 1.0f - bulge_min; - float scale = (range > 0.0f) ? 1.0f / range : 0.0f; - float soft = 1.0f - range * atanf((1.0f - bulge) * scale) / (float)M_PI_2; + float scale_fac = (range > 0.0f) ? 1.0f / range : 0.0f; + float soft = 1.0f - range * atanf((1.0f - bulge) * scale_fac) / (float)M_PI_2; bulge = interpf(soft, hard, data->bulge_smooth); } |