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/blenkernel/intern/collision.c | 4 +++- source/blender/blenkernel/intern/effect.c | 2 +- source/blender/editors/physics/particle_edit.c | 2 +- source/blender/editors/space_view3d/view3d_intern.h | 1 + source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- source/blender/physics/intern/implicit_blender.c | 2 +- 6 files changed, 8 insertions(+), 5 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; diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 82c3ed847a9..c18726e5905 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -1034,7 +1034,7 @@ static unsigned int debug_element_hash(const void *key) return elem->hash; } -static int debug_element_compare(const void *a, const void *b) +static bool debug_element_compare(const void *a, const void *b) { const SimDebugElement *elem1 = a; const SimDebugElement *elem2 = b; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index b739f1572c1..2c3280a3659 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4151,7 +4151,7 @@ static void shape_cut(PEData *data, int pa_index) } } -static int shape_cut_exec(bContext *C, wmOperator *op) +static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index c0517cf1151..1cd5c5453c2 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -52,6 +52,7 @@ struct SimDebugData; struct wmNDOFMotionData; struct wmOperatorType; struct wmWindowManager; +struct wmKeyConfig; /* drawing flags: */ enum { 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]; diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 713653ae574..6b82dd3f736 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -324,7 +324,6 @@ static void print_sparse_matrix(fmatrix3x3 *m) } } } -#endif static void print_lvector(lfVector *v, int numverts) { @@ -381,6 +380,7 @@ static void print_bfmatrix(fmatrix3x3 *m) MEM_freeN(t); } +#endif /* copy 3x3 matrix */ DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3]) -- cgit v1.2.3