From bbae8f88b8f305a8ed85cab718d2a66b476da3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Wed, 17 Sep 2014 14:21:06 +0200 Subject: Made the voxel grid size for hair interaction configurable and increased the default to 32. Conflicts: source/blender/blenloader/intern/versioning_270.c --- 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 e9107394bd2..0fa14fa4eab 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -421,7 +421,7 @@ static void cloth_calc_volume_force(ClothModifierData *clmd) /* gather velocities & density */ if (smoothfac > 0.0f || pressfac > 0.0f) { - HairVertexGrid *vertex_grid = BPH_hair_volume_create_vertex_grid(gmin, gmax); + HairVertexGrid *vertex_grid = BPH_hair_volume_create_vertex_grid(clmd->sim_parms->voxel_res, gmin, gmax); for (i = 0; i < numverts; i++) { float x[3], v[3]; -- cgit v1.2.3