diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-01 06:11:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-01 06:11:12 +0400 |
| commit | ac38f2584f1c08d5f9db9f4fbd71f8845885c6d1 (patch) | |
| tree | 4557d7b1549a6d62fe8a0043a0f0bf9dd0ef5c62 /source/blender/blenkernel | |
| parent | dbd7025fae31f18037be39e9dcd8ed84e1ac41cd (diff) | |
Code Cleanup: replace ABS() with fabsf() when used with float expressions.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index c8e18bc3dee..fce6ed9d6c6 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1265,7 +1265,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = clmd->sim_parms->structural; - scaling = k + s->stiffness * ABS(clmd->sim_parms->max_struct-k); + scaling = k + s->stiffness * fabsf(clmd->sim_parms->max_struct - k); k = scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); @@ -1305,7 +1305,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = clmd->sim_parms->goalspring; - scaling = k + s->stiffness * ABS(clmd->sim_parms->max_struct-k); + scaling = k + s->stiffness * fabsf(clmd->sim_parms->max_struct - k); k = verts [s->ij].goal * scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); @@ -1324,7 +1324,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = clmd->sim_parms->bending; - scaling = k + s->stiffness * ABS(clmd->sim_parms->max_bend-k); + scaling = k + s->stiffness * fabsf(clmd->sim_parms->max_bend - k); cb = k = scaling / (20.0f * (clmd->sim_parms->avg_spring_len + FLT_EPSILON)); mul_fvector_S(bending_force, dir, fbstar(length, L, k, cb)); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ee25b0a72df..af23a84a26b 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -251,7 +251,7 @@ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2 for (k = 0; k < dv1->totweight; k++, dw1++, dw2++) { if (dw1->def_nr != dw2->def_nr) return MESHCMP_DVERT_GROUPMISMATCH; - if (ABS(dw1->weight - dw2->weight) > thresh) + if (fabsf(dw1->weight - dw2->weight) > thresh) return MESHCMP_DVERT_WEIGHTMISMATCH; } } |