Revision: 41404
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41404
Author: ender79
Date: 2011-10-31 00:44:12 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Miscellaneous warning fixes (mostly unused local vars) and trivial cleanups
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
2011-10-31 00:35:14 UTC (rev 41403)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
2011-10-31 00:44:12 UTC (rev 41404)
@@ -57,7 +57,7 @@
void defvert_copy(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert);
void defvert_sync(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert, int use_verify);
-void defvert_sync_mapped(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert, const int *flip_map, const int flip_map_len, int use_verify);
+void defvert_sync_mapped(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert, const int *flip_map, const int flip_map_len, const int use_verify);
void defvert_remap (struct MDeformVert *dvert, int *map);
void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int
flip_map_len);
void defvert_normalize(struct MDeformVert *dvert);
Modified:
branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
2011-10-31 00:35:14 UTC (rev 41403)
+++ branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
2011-10-31 00:44:12 UTC (rev 41404)
@@ -106,7 +106,7 @@
* the distance gets very high, 180d would be inf, but this case isn't valid */
MINLINE float shell_angle_to_dist(const float angle)
{
- return (1.0f + SMALL_NUMBER) / (fabs(cosf(angle)) + SMALL_NUMBER);
+ return (1.0f + SMALL_NUMBER) / ((float)fabs(cosf(angle)) +
SMALL_NUMBER);
}
/* used for zoom values*/
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2011-10-31 00:35:14 UTC (rev 41403)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2011-10-31 00:44:12 UTC (rev 41404)
@@ -80,9 +80,6 @@
void poly_rotate_plane(float normal[3], float (*verts)[3], int nverts);
void bmesh_flip_normal(struct BMesh *bm, struct BMFace *f);
-/*Error reporting. Shouldnt be called by tools ever.*/
-void BME_error(void);
-
BMEdge *bmesh_disk_next(BMEdge *e, BMVert *v);
BMEdge *bmesh_disk_prev(BMEdge *e, BMVert *v);
Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-10-31 00:35:14 UTC (rev 41403)
+++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-10-31 00:44:12 UTC (rev 41404)
@@ -995,7 +995,6 @@
static BMFace *knife_find_closest_face(knifetool_opdata *kcd, float co[3],
float cageco[3], int *is_space)
{
BMFace *f;
- float mval[2], imat[3][3];
int dist = KMAXDIST;
float origin[3];
float ray[3];
Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
2011-10-31 00:35:14 UTC (rev 41403)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
2011-10-31 00:44:12 UTC (rev 41404)
@@ -105,7 +105,7 @@
{
float tolerance_sq;
DerivedMesh *cddm, *origdm;
- bDeformGroup *def, *defb;
+ bDeformGroup *def;
bDeformGroup **vector_def = NULL;
MVert *mv, *ov;
MEdge *me;
@@ -114,7 +114,7 @@
float mtx[4][4];
int i, j, *vtargetmap = NULL;
BLI_array_declare(vtargetmap);
- int vector_size=0, a, b, totshape;
+ int vector_size=0, a, totshape;
tolerance_sq = mmd->tolerance * mmd->tolerance;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
