diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 17:49:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 17:49:53 +0400 |
| commit | 9997c3c8951fb253fa5e37b624b81005202ceb6d (patch) | |
| tree | 5eaa8171f5d0cca14126dfa1107abb2fa6ec36b1 /source/blender/modifiers/intern/MOD_simpledeform.c | |
| parent | 3cb6f52eec3beae54adcec64e1213995dfac0423 (diff) | |
modifiers: floats were being implicitly promoted to doubles, adjust to use floats.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_simpledeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_simpledeform.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index fc13eafa866..2e6d9350148 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -89,11 +89,11 @@ static void simpleDeform_stretch(const float factor, const float dcut[3], float float x = co[0], y = co[1], z = co[2]; float scale; - scale = (z*z*factor-factor + 1.0); + scale = (z*z*factor-factor + 1.0f); co[0] = x*scale; co[1] = y*scale; - co[2] = z*(1.0+factor); + co[2] = z*(1.0f+factor); if(dcut) @@ -134,7 +134,7 @@ static void simpleDeform_bend(const float factor, const float dcut[3], float *co sint = sin(theta); cost = cos(theta); - if(fabs(factor) > 1e-7f) + if(fabsf(factor) > 1e-7f) { co[0] = -(y-1.0f/factor)*sint; co[1] = (y-1.0f/factor)*cost + 1.0f/factor; @@ -168,8 +168,8 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object //Safe-check if(smd->origin == ob) smd->origin = NULL; //No self references - if(smd->limit[0] < 0.0) smd->limit[0] = 0.0f; - if(smd->limit[0] > 1.0) smd->limit[0] = 1.0f; + if(smd->limit[0] < 0.0f) smd->limit[0] = 0.0f; + if(smd->limit[0] > 1.0f) smd->limit[0] = 1.0f; smd->limit[0] = MIN2(smd->limit[0], smd->limit[1]); //Upper limit >= than lower limit |