[Bf-blender-cvs] [ff15a79] hair_immediate_fixes: Fill the hair volume grid with the _new_ velocities from the first solver step, instead of using the previous step's velocities.

Lukas Tönne noreply at git.blender.org
Fri Oct 31 16:34:33 CET 2014


Commit: ff15a79cbdbe6586a1cc52aba20398dc2683a394
Author: Lukas Tönne
Date:   Fri Oct 31 15:20:45 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rBff15a79cbdbe6586a1cc52aba20398dc2683a394

Fill the hair volume grid with the _new_ velocities from the first
solver step, instead of using the previous step's velocities.

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

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 0e561dd..85f0b4c 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -734,7 +734,8 @@ static void cloth_continuum_step(ClothModifierData *clmd)
 				copy_v3_v3(v, vert->v);
 			}
 			else {
-				BPH_mass_spring_get_motion_state(data, vert->solver_index, x, v);
+				BPH_mass_spring_get_position(data, vert->solver_index, x);
+				BPH_mass_spring_get_new_velocity(data, vert->solver_index, v);
 			}
 			BPH_hair_volume_add_vertex(vertex_grid, x, v);
 		}




More information about the Bf-blender-cvs mailing list