archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for warnings/errors

Browse Source 
Conflicts:
	source/blender/blenkernel/intern/key.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/makesrna/intern/rna_particle.c
This commit is contained in:
Lukas Tönne
2015-01-19 19:14:14 +01:00
parent a351e8b6ef
commit 4ff68d031d
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/physics/intern/BPH_mass_spring.cpp
View File

@@ -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];