From 6e44e4181fc1cb77997889c6414524deeb07e083 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 20 Jan 2015 21:06:21 +1100 Subject: Cleanup: warnings --- source/blender/physics/intern/BPH_mass_spring.cpp | 14 +++++++------- source/blender/physics/intern/implicit_blender.c | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'source/blender/physics') diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index c8e052c080e..112287150cd 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -582,8 +582,8 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c Implicit_Data *data = cloth->implicit; LinkNode *next_spring_link = NULL; /* return value */ ClothSpring *spring1, *spring2, *spring3; - ClothVertex *verts = cloth->verts; - ClothVertex *vert3, *vert4; + // ClothVertex *verts = cloth->verts; + // ClothVertex *vert3, *vert4; float x1[3], v1[3], x2[3], v2[3], x3[3], v3[3], x4[3], v4[3]; float dir1[3], dir2[3], dir3[3]; @@ -596,9 +596,9 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c zero_v3(x2); zero_v3(v2); zero_v3(dir2); - vert3 = &verts[spring3->kl]; + // vert3 = &verts[spring3->kl]; cloth_get_grid_location(data, cell_scale, cell_offset, spring3->kl, x3, v3); - vert4 = &verts[spring3->ij]; + // vert4 = &verts[spring3->ij]; cloth_get_grid_location(data, cell_scale, cell_offset, spring3->ij, x4, v4); sub_v3_v3v3(dir3, x4, x3); normalize_v3(dir3); @@ -608,7 +608,7 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c spring1 = spring2; spring2 = spring3; - vert3 = vert4; + // vert3 = vert4; copy_v3_v3(x1, x2); copy_v3_v3(v1, v2); copy_v3_v3(x2, x3); copy_v3_v3(v2, v3); @@ -623,14 +623,14 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c if (spring_link) { spring3 = (ClothSpring *)spring_link->link; - vert4 = &verts[spring3->ij]; + // vert4 = &verts[spring3->ij]; cloth_get_grid_location(data, cell_scale, cell_offset, spring3->ij, x4, v4); sub_v3_v3v3(dir3, x4, x3); normalize_v3(dir3); } else { spring3 = NULL; - vert4 = NULL; + // vert4 = NULL; zero_v3(x4); zero_v3(v4); zero_v3(dir3); } diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 9f43e793e05..ce65703901a 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -326,6 +326,7 @@ static void print_sparse_matrix(fmatrix3x3 *m) } #endif +#if 0 static void print_lvector(lfVector *v, int numverts) { int i; @@ -338,7 +339,9 @@ static void print_lvector(lfVector *v, int numverts) printf("%f,\n", v[i][2]); } } +#endif +#if 0 static void print_bfmatrix(fmatrix3x3 *m) { int tot = m[0].vcount + m[0].scount; @@ -381,6 +384,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