diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-10-31 18:30:54 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
| commit | 9be290c92e02593ae34a96166949e1517f3f369d (patch) | |
| tree | 923862bb911dac0554abf74f91e8c5df12a8f61c /source/blender/physics/intern/BPH_mass_spring.cpp | |
| parent | 54c69c4ed83b00cf04864169c5dd2ce8f3110a45 (diff) | |
Removed arbitrary factor 2.0 on volumetric hair friction factor.
This was introducing energy into the system for any factor beyond 0.5
and caused major instability.
Diffstat (limited to 'source/blender/physics/intern/BPH_mass_spring.cpp')
| -rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index b7ee42d6ea5..ae5db7db3e9 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -593,9 +593,7 @@ static void cloth_continuum_step(ClothModifierData *clmd) ClothVertex *vert; const float fluid_factor = 0.95f; /* blend between PIC and FLIP methods */ - /* 2.0f is an experimental value that seems to give good results */ - float smoothfac = 2.0f * parms->velocity_smooth; - float collfac = 2.0f * parms->collider_friction; + float smoothfac = parms->velocity_smooth; float pressfac = parms->pressure; float minpress = parms->pressure_threshold; float gmin[3], gmax[3]; |