[Bf-blender-cvs] [9be290c] master: Removed arbitrary factor 2.0 on volumetric hair friction factor.

[Lukas Tönne]

Commit: 9be290c92e02593ae34a96166949e1517f3f369d
Author: Lukas Tönne
Date:   Fri Oct 31 16:30:54 2014 +0100
Branches: master
https://developer.blender.org/rB9be290c92e02593ae34a96166949e1517f3f369d

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];