diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-19 21:14:14 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
| commit | 4ff68d031d3a22e13125f3eadaf18808da52a99a (patch) | |
| tree | caa83ed93f1099f872c961a1ee8a06d33baa5b77 /source/blender/physics/intern/BPH_mass_spring.cpp | |
| parent | a351e8b6ef81f07b400cf2b7389f8ac1c7bb7e6b (diff) | |
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
Diffstat (limited to 'source/blender/physics/intern/BPH_mass_spring.cpp')
| -rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |