[Bf-blender-cvs] [39990d8] alembic: Use mass parameter for setting gravity forces in cached hair sim.

Lukas Tönne noreply at git.blender.org
Wed Apr 22 12:11:06 CEST 2015


Commit: 39990d8eecfd4d817dab95fa86d2e83189beaded
Author: Lukas Tönne
Date:   Wed Apr 22 12:10:00 2015 +0200
Branches: alembic
https://developer.blender.org/rB39990d8eecfd4d817dab95fa86d2e83189beaded

Use mass parameter for setting gravity 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 7942709..4053f1c 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -1425,7 +1425,7 @@ static void strands_calc_force(Strands *strands, float space[4][4], HairSimParam
 		mul_v3_v3fl(gravity, scene->physics_settings.gravity, params->effector_weights->global_gravity);
 	}
 	for (i = 0; i < numverts; i++) {
-		float mass = 1.0f; // TODO
+		float mass = params->mass;
 		BPH_mass_spring_force_gravity(data, i, mass, gravity);
 	}




More information about the Bf-blender-cvs mailing list