From 46db2888327a212ef6b3bbb4d16360f7b9e563c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Thu, 6 Nov 2014 14:57:31 +0100 Subject: Minor debug code fix. Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp --- source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 45032b1f233..dfc08b5574b 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)) -- cgit v1.2.3