[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35657] branches/bmesh/blender/source/ blender/bmesh/operators: clear more warnings.
Campbell Barton
ideasman42 at gmail.com
Sun Mar 20 17:30:40 CET 2011
Revision: 35657
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35657
Author: campbellbarton
Date: 2011-03-20 16:30:39 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
clear more warnings.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -67,12 +67,12 @@
return factor;
}
-void calc_corner_co(BMesh *bm, BMLoop *l, float *co, float fac)
+void calc_corner_co(BMesh *UNUSED(bm), BMLoop *l, float *co, float fac)
{
- float no[3], tan[3], vec1[3], vec2[3], v1[3], v2[3], v3[3], v4[3];
- float p1[3], p2[3], w[3];
- float l1, l2;
- int ret;
+ float /* no[3], tan[3], */ vec1[3], vec2[3], v1[3], v2[3], v3[3], v4[3];
+ // float p1[3], p2[3], w[3];
+ // float l1, l2;
+ // int ret;
copy_v3_v3(v1, l->prev->v->co);
copy_v3_v3(v2, l->v->co);
@@ -660,8 +660,8 @@
BMIter liter;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v) {
- BMIter liter2;
- BMLoop *l2 = l->v == v ? l : l->next, *l3;
+ // BMIter liter2;
+ // BMLoop *l2 = l->v == v ? l : l->next, *l3;
if (BMO_TestFlag(bm, l->f, FACE_OLD)) {
lorig = l;
@@ -673,7 +673,7 @@
continue;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v) {
- BMLoop *l2 = l->v == v ? l : l->next, *l3;
+ BMLoop *l2 = l->v == v ? l : l->next; //, *l3;
BM_Copy_Attributes(bm, bm, lorig->f, l2->f);
BM_Copy_Attributes(bm, bm, lorig, l2);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -24,7 +24,7 @@
BMIter liter2;
BMLoop *l2, *l3;
BMFace *f2;
-
+
/*checks if there are any unmarked boundary edges in the face region*/
BMW_Init(®walker, bm, BMW_ISLAND, FACE_MARK, 0);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -41,7 +41,7 @@
#define T2QJOIN 4
/*assumes edges are validated before reaching this point*/
-static float measure_facepair(BMesh *bm, BMVert *v1, BMVert *v2,
+static float measure_facepair(BMesh *UNUSED(bm), BMVert *v1, BMVert *v2,
BMVert *v3, BMVert *v4, float limit)
{
/*gives a 'weight' to a pair of triangles that join an edge to decide how good a join they would make*/
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mirror.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mirror.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -43,7 +43,7 @@
BMIter iter;
BMVert *v, *v2, **vmap = NULL;
BLI_array_declare(vmap);
- BMEdge *e, **emap = NULL;
+ BMEdge /* *e, */ **emap = NULL;
BLI_array_declare(emap);
float mtx[4][4];
float imtx[4][4];
@@ -124,4 +124,3 @@
BLI_array_free(vmap);
BLI_array_free(emap);
}
-
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -1,4 +1,4 @@
-#include "MEM_guardedalloc.h"-
+#include "MEM_guardedalloc.h"
#include "DNA_meshdata_types.h"
#include "DNA_mesh_types.h"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -271,7 +271,7 @@
BMOIter siter;
BMIter iter;
BMVert *v;
- BMLoop *l, *firstl = NULL;
+ BMLoop *l /* , *firstl = NULL */;
CDBlockBytes min, max;
void *block;
int i, type;
@@ -562,7 +562,7 @@
BMVert **verts=NULL;
BLI_array_declare(verts);
float dist, distsqr;
- int i, j, len, keepvert;
+ int i, j, len /* , keepvert */;
dist = BMO_Get_Float(op, "dist");
distsqr = dist*dist;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -115,7 +115,7 @@
return NULL;
}
/* calculates offset for co, based on fractal, sphere or smooth settings */
-static void alter_co(float *co, BMEdge *edge, subdparams *params, float perc,
+static void alter_co(float *co, BMEdge *UNUSED(edge), subdparams *params, float perc,
BMVert *vsta, BMVert *vend)
{
float vec1[3], fac;
@@ -376,12 +376,13 @@
v7-v0--v1-v2
*/
-static void quad_2edge_split_fan(BMesh *bm, BMFace *face, BMVert **verts,
+static void quad_2edge_split_fan(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
subdparams *params)
{
BMFace *nf;
- BMVert *v, *lastv;
- BMEdge *e, *ne;
+ // BMVert *v;
+ BMVert *lastv;
+ // BMEdge *e, *ne;
int i, numcuts = params->numcuts;
lastv = verts[2];
@@ -409,7 +410,7 @@
v9-v0--v1-v2
*/
-static void quad_3edge_split(BMesh *bm, BMFace *face, BMVert **verts,
+static void quad_3edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
subdparams *params)
{
BMFace *nf;
@@ -450,7 +451,7 @@
it goes from bottom up
*/
-static void quad_4edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts,
+static void quad_4edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
subdparams *params)
{
BMFace *nf;
@@ -458,7 +459,7 @@
BMEdge *e, *ne, temp;
BMVert **lines;
int numcuts = params->numcuts;
- int i, j, a, b, s=numcuts+2, totv=numcuts*4+4;
+ int i, j, a, b, s=numcuts+2 /* , totv=numcuts*4+4 */;
lines = MEM_callocN(sizeof(BMVert*)*(numcuts+2)*(numcuts+2),
"q_4edge_split");
@@ -529,7 +530,7 @@
v4--v0--v1--v2
s s
*/
-static void tri_1edge_split(BMesh *bm, BMFace *face, BMVert **verts,
+static void tri_1edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
subdparams *params)
{
BMFace *nf;
@@ -555,7 +556,7 @@
v8--v0--v1--v2
s s
*/
-static void tri_3edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts,
+static void tri_3edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
subdparams *params)
{
BMFace *nf;
@@ -982,7 +983,7 @@
}
/*editmesh-emulating function*/
-void BM_esubdivideflag(Object *obedit, BMesh *bm, int flag, float smooth,
+void BM_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float smooth,
float fractal, int beauty, int numcuts,
int seltype, int cornertype, int singleedge, int gridfill)
{
@@ -999,7 +1000,7 @@
if (seltype == SUBDIV_SELECT_INNER) {
BMOIter iter;
BMHeader *ele;
- int i;
+ // int i;
ele = BMO_IterNew(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
for (; ele; ele=BMO_IterStep(&iter)) {
@@ -1008,7 +1009,7 @@
} else if (seltype == SUBDIV_SELECT_LOOPCUT) {
BMOIter iter;
BMHeader *ele;
- int i;
+ // int i;
/*deselect input*/
BM_clear_flag_all(bm, BM_SELECT);
@@ -1072,4 +1073,3 @@
BMO_Flag_To_Slot(bm, op, "outsplit",
ELE_SPLIT, BM_ALL);
}
-
Modified: branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -21,7 +21,7 @@
BLI_array_declare(newfaces);
float (*projectverts)[3] = NULL;
BLI_array_declare(projectverts);
- int i, lastlen=0, count = 0;
+ int i, lastlen=0 /* , count = 0 */;
face = BMO_IterNew(&siter, bm, op, "faces", BM_FACE);
for (; face; face=BMO_IterStep(&siter)) {
@@ -53,4 +53,4 @@
BLI_array_free(projectverts);
BLI_array_free(newfaces);
-}
\ No newline at end of file
+}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/utils.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/utils.c 2011-03-20 15:39:08 UTC (rev 35656)
+++ branches/bmesh/blender/source/blender/bmesh/operators/utils.c 2011-03-20 16:30:39 UTC (rev 35657)
@@ -716,10 +716,10 @@
BMIter e_iter; /* mesh edges iterator */
BMEdge *es; /* selected edge */
BMEdge *e; /* mesh edge */
- int idx = 0, i = 0, f = 0;
+ int idx = 0, i = 0 /* , f = 0 */;
int *indices = NULL;
tmp_edge_ext *e_ext = NULL;
- float *angles = NULL;
+ // float *angles = NULL;
float angle;
int num_sels = 0, num_total = 0;
@@ -982,7 +982,7 @@
BMOIter fs_iter; /* selected faces iterator */
BMFace *fs; /* current face */
BMIter l_iter; /* iteration loop */
- int n;
+ // int n;
int dir = BMO_Get_Int(op, "dir");
@@ -1097,7 +1097,7 @@
BMOIter fs_iter; /* selected faces iterator */
BMFace *fs; /* current face */
BMIter l_iter; /* iteration loop */
- int n;
+ // int n;
int dir = BMO_Get_Int(op, "dir");
@@ -1206,7 +1206,7 @@
void bmesh_vertexshortestpath_exec(BMesh *bm, BMOperator *op)
{
- BMOIter vs_iter, vs2_iter; /* selected verts iterator */
+ BMOIter vs_iter /* , vs2_iter */; /* selected verts iterator */
BMIter v_iter; /* mesh verts iterator */
BMVert *vs, *sv, *ev; /* starting vertex, ending vertex */
BMVert *v; /* mesh vertex */
@@ -1214,7 +1214,7 @@
element_node *vert_list = NULL;
- int num_total = 0, num_sels = 0, i = 0;
+ int num_total = 0 /*, num_sels = 0 */, i = 0;
int type = BMO_Get_Int(op, "type");
BMO_ITER(vs, &vs_iter, bm, op, "startv", BM_VERT)
More information about the Bf-blender-cvs
mailing list