[Bf-blender-cvs] [15adaac] temp_merge_gooseberry_hair: Removed arbitrary factor 2.0 on volumetric hair friction factor.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:50:25 CET 2015
Commit: 15adaac15d13bab4893d73c56bb073cef951ee9b
Author: Lukas Tönne
Date: Fri Oct 31 16:30:54 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB15adaac15d13bab4893d73c56bb073cef951ee9b
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.
===================================================================
M source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index b7ee42d..ae5db7d 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];
More information about the Bf-blender-cvs
mailing list