[Bf-blender-cvs] [8f6fd38] alembic: Used the mass parameter for hair simulation.
Lukas Tönne
noreply at git.blender.org
Sun Apr 12 14:40:35 CEST 2015
Commit: 8f6fd382a17cab02dcc55103610faa0d43ce64df
Author: Lukas Tönne
Date: Sat Apr 11 21:51:44 2015 +0200
Branches: alembic
https://developer.blender.org/rB8f6fd382a17cab02dcc55103610faa0d43ce64df
Used the mass parameter for hair simulation.
===================================================================
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 304e99e..4c13b1a 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -1122,7 +1122,7 @@ bool BPH_cloth_solver_get_texture_data(Object *UNUSED(ob), ClothModifierData *cl
/* ========================================================================= */
-struct Implicit_Data *BPH_strands_solver_create(struct Strands *strands, struct HairSimParams *UNUSED(params))
+struct Implicit_Data *BPH_strands_solver_create(struct Strands *strands, struct HairSimParams *params)
{
static float I3[3][3] = { {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 1.0f} };
@@ -1143,7 +1143,7 @@ struct Implicit_Data *BPH_strands_solver_create(struct Strands *strands, struct
for (i = 0; i < numverts; i++) {
// TODO define mass
- float mass = 1.0f;
+ float mass = params->mass;
BPH_mass_spring_set_vertex_mass(id, i, mass);
}
More information about the Bf-blender-cvs
mailing list