[Bf-blender-cvs] [6ebab85] temp_merge_gooseberry_hair: Minor debug code fix.

Lukas Tönne noreply at git.blender.org
Mon Jan 19 20:50:41 CET 2015


Commit: 6ebab855e6c443af52a84ed586ad454ab46bf7c5
Author: Lukas Tönne
Date:   Thu Nov 6 14:57:31 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB6ebab855e6c443af52a84ed586ad454ab46bf7c5

Minor debug code fix.

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 45032b1..dfc08b5 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -817,7 +817,7 @@ static void cloth_continuum_step(ClothModifierData *clmd)
 					madd_v3_v3fl(x, b, (float)j / (float)(size-1));
 					zero_v3(v);
 					
-					BPH_hair_volume_grid_interpolate(vertex_grid, x, &gdensity, gvel, NULL, NULL);
+					BPH_hair_volume_grid_interpolate(grid, x, &gdensity, gvel, NULL, NULL);
 					
 //					BKE_sim_debug_data_add_circle(clmd->debug_data, x, gdensity, 0.7, 0.3, 1, "grid density", hash_int_2d(hash_int_2d(i, j), 3111));
 					if (!is_zero_v3(gvel))




More information about the Bf-blender-cvs mailing list