diff options
author | Jens Ole Wund <bjornmose@gmx.net> | 2008-07-26 02:58:22 +0400 |
---|---|---|
committer | Jens Ole Wund <bjornmose@gmx.net> | 2008-07-26 02:58:22 +0400 |
commit | 1b3cf253eda825cfbb2209dbe6cbc83ac653db5f (patch) | |
tree | c12e74ebcf8bff3161b8224603b6db37c2e304de /source/blender/blenkernel/intern | |
parent | f6b85a55fa16349f59fdee736a6dc62cc4f022ac (diff) |
rolling back 'bad' wind and force scaling compared to particles ..
because i have no solution on backward compatibility
keeping bug fix
-wind and force did not work if aero or edge collision was activated.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 8fe956002a9..d5b5ab6d63e 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1548,7 +1548,7 @@ void scan_for_ext_spring_forces(Object *ob,float timenow) /* note we don't use sb->mediafrict but use sb->aeroedge for magnitude of effect*/ if(sb->aeroedge){ float vel[3],sp[3],pr[3],force[3]; - float f,windfactor = 10.0f; + float f,windfactor = 250.0f; /*see if we have wind*/ if(do_effector) { float speed[3]={0.0f,0.0f,0.0f}; @@ -2034,7 +2034,7 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int BodySpring *bs; ListBase *do_effector; float iks, ks, kd, gravity; - float fieldfactor = -100.0f, windfactor = 10.0f; + float fieldfactor = 1000.0f, windfactor = 250.0f; float tune = sb->ballstiff; int a, b, do_deflector,do_selfcollision,do_springcollision,do_aero; |