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/softbody.c | |
parent | bc8504cb4c93eb3aac22222f62966c13560a2bf6 (diff) |
Cleanup: shadowing (blenkernel)
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 602e9936020..86ffb541bf8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2254,7 +2254,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa float iks, ks, kd, gravity[3] = {0.0f, 0.0f, 0.0f}; float fieldfactor = -1.0f, windfactor = 0.25f; float tune = sb->ballstiff; - int a, b, do_deflector, do_selfcollision, do_springcollision, do_aero; + int do_deflector, do_selfcollision, do_springcollision, do_aero; if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) { copy_v3_v3(gravity, scene->physics_settings.gravity); @@ -2279,7 +2279,8 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa do_deflector = sb_detect_aabb_collisionCached(defforce, ob->lay, ob, timenow); } - for (a=sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) { + bp = sb->bpoint; + for (int a = sb->totpoint; a > 0; a--, bp++) { /* clear forces accumulator */ bp->force[0] = bp->force[1] = bp->force[2] = 0.0; @@ -2451,7 +2452,7 @@ static void softbody_calc_forces(Scene *scene, Object *ob, float forcetime, floa /* +++springs */ if (ob->softflag & OB_SB_EDGES) { if (sb->bspring) { /* spring list exists at all ? */ - for (b=bp->nofsprings;b>0;b--) { + for (int b = bp->nofsprings; b > 0; b--) { bs = sb->bspring + bp->springs[b-1]; if (do_springcollision || do_aero) { add_v3_v3(bp->force, bs->ext_force); |