diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
| commit | 8480bb64ec7e5f367b914dc46e9c929945a6ebb0 (patch) | |
| tree | 3c7a2982a001dd9efb9b99115454576906815637 /source/blender/blenkernel/intern/implicit.c | |
| parent | 930765faa81efe3894e5476a59f5f3298da54ae4 (diff) | |
Code cleanup: style
Diffstat (limited to 'source/blender/blenkernel/intern/implicit.c')
| -rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 08959850fb9..cceb7925194 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1271,16 +1271,17 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s, k = scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); // TODO: verify, half verified (couldn't see error) - if(s->type & CLOTH_SPRING_TYPE_SEWING) { - // sewing springs usually have a large distance at first so clamp the force so we don't get tunnelling through colission objects - float force = k*(length-L); - if(force > clmd->sim_parms->max_sewing) { - force = clmd->sim_parms->max_sewing; - } - mul_fvector_S(stretch_force, dir, force); - } else { - mul_fvector_S(stretch_force, dir, k*(length-L)); - } + if (s->type & CLOTH_SPRING_TYPE_SEWING) { + // sewing springs usually have a large distance at first so clamp the force so we don't get tunnelling through colission objects + float force = k*(length-L); + if (force > clmd->sim_parms->max_sewing) { + force = clmd->sim_parms->max_sewing; + } + mul_fvector_S(stretch_force, dir, force); + } + else { + mul_fvector_S(stretch_force, dir, k * (length - L)); + } VECADD(s->f, s->f, stretch_force); |