[Bf-blender-cvs] [ffbb48b] alembic: Enabled air drag forces in cached hair sim.

[Lukas Tönne]

Commit: ffbb48b064f3055e9a058d8984ee8928c93796da
Author: Lukas Tönne
Date:   Wed Apr 22 12:10:25 2015 +0200
Branches: alembic
https://developer.blender.org/rBffbb48b064f3055e9a058d8984ee8928c93796da

Enabled air drag forces in cached hair sim.

===================================================================

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 4053f1c..37b1fdc 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -1416,7 +1416,6 @@ static void strands_calc_force(Strands *strands, float space[4][4], HairSimParam
 	unsigned int numverts = strands->totverts;
 	
 	int i = 0;
-//	float drag = params->Cvi * 0.01f; /* viscosity of air scaled in percent */
 	float gravity[3] = {0.0f, 0.0f, 0.0f};
 	
 	/* global acceleration (gravitation) */
@@ -1428,10 +1427,8 @@ static void strands_calc_force(Strands *strands, float space[4][4], HairSimParam
 		float mass = params->mass;
 		BPH_mass_spring_force_gravity(data, i, mass, gravity);
 	}
-
-#if 0
-	BPH_mass_spring_force_drag(data, drag);
-#endif
+	
+	BPH_mass_spring_force_drag(data, params->drag);
 	
 	/* handle external forces like wind */
 	if (effectors || (cache_effectors && tot_cache_effectors > 0)) {