Commit: 54c69c4ed83b00cf04864169c5dd2ce8f3110a45
Author: Lukas Tönne
Date: Fri Oct 31 15:20:45 2014 +0100
Branches: master
https://developer.blender.org/rB54c69c4ed83b00cf04864169c5dd2ce8f3110a45
Fill the hair volume grid with the _new_ velocities from the first
solver step, instead of using the previous step's velocities.
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
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 55475d0..b7ee42d 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -617,6 +617,8 @@ static void cloth_continuum_step(ClothModifierData *clmd)
float x[3], v[3];
BPH_mass_spring_get_motion_state(data, i, x, v);
+ BPH_mass_spring_get_position(data, i, x);
+ BPH_mass_spring_get_new_velocity(data, i, v);
BPH_hair_volume_add_vertex(vertex_grid, x, v);
}
BPH_hair_volume_normalize_vertex_grid(vertex_grid);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
