From 4ff68d031d3a22e13125f3eadaf18808da52a99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 19 Jan 2015 19:14:14 +0100 Subject: Fix for warnings/errors Conflicts: source/blender/blenkernel/intern/key.c source/blender/blenkernel/intern/particle_system.c source/blender/makesrna/intern/rna_particle.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 6657058db48..7df58e0ff33 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -463,7 +463,7 @@ static void cloth_calc_volume_force(ClothModifierData *clmd) /* 2.0f is an experimental value that seems to give good results */ float smoothfac = 2.0f * parms->velocity_smooth; - float collfac = 2.0f * parms->collider_friction; + // float collfac = 2.0f * parms->collider_friction; float pressfac = parms->pressure; float minpress = parms->pressure_threshold; float gmin[3], gmax[3]; -- cgit v1.2.3