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/blenkernel/intern/collision.c | |
| 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/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index a8273b502a1..f4748f862f6 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -85,10 +85,12 @@ static unsigned int hash_int_2d(unsigned int kx, unsigned int ky) #undef rot } +#if 0 static int hash_vertex(int type, int vertex) { return hash_int_2d((unsigned int)type, (unsigned int)vertex); } +#endif static int hash_collpair(int type, CollPair *collpair) { @@ -1154,7 +1156,7 @@ BLI_INLINE bool cloth_point_face_collision_params(const float p1[3], const float } static CollPair *cloth_point_collpair(float p1[3], float p2[3], MVert *mverts, int bp1, int bp2, int bp3, - int index_cloth, int index_coll, float epsilon, CollPair *collpair, SimDebugData *debug_data) + int index_cloth, int index_coll, float epsilon, CollPair *collpair, SimDebugData *UNUSED(debug_data)) { float *co1 = mverts[bp1].co, *co2 = mverts[bp2].co, *co3 = mverts[bp3].co; float lambda, distance1, distance2; |