[Bf-blender-cvs] [59ba73c] hair_system: Keep the solver over time steps during a single modifier eval.
Lukas Tönne
noreply at git.blender.org
Sun Jul 27 18:40:31 CEST 2014
Commit: 59ba73ca8043d7218e6bd902b743aa3a580ddefb
Author: Lukas Tönne
Date: Sun Jul 27 18:40:10 2014 +0200
Branches: hair_system
https://developer.blender.org/rB59ba73ca8043d7218e6bd902b743aa3a580ddefb
Keep the solver over time steps during a single modifier eval.
===================================================================
M source/blender/modifiers/intern/MOD_hair.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_hair.c
index c8d05f5..1394c81 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_hair.c
@@ -92,18 +92,17 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
float dt = 1.0f / (float)hmd->steps_per_second;
int s;
+ solver = HAIR_solver_new();
+ HAIR_solver_init(solver, hsys);
+
if (num_steps < 10000) {
for (s = 0; s < num_steps; ++s) {
- solver = HAIR_solver_new();
- HAIR_solver_init(solver, hsys);
-
HAIR_solver_step(solver, dt);
-
- HAIR_solver_apply(solver, hsys);
-
- HAIR_solver_free(solver);
}
}
+ HAIR_solver_apply(solver, hsys);
+
+ HAIR_solver_free(solver);
}
return dm;
More information about the Bf-blender-cvs
mailing list