[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39992] branches/bmesh/blender/source/ blender: code cleanup - commant/remove unused vars and reduce scope.
Campbell Barton
ideasman42 at gmail.com
Wed Sep 7 08:49:22 CEST 2011
Revision: 39992
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39992
Author: campbellbarton
Date: 2011-09-07 06:49:20 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
code cleanup - commant/remove unused vars and reduce scope.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -1359,7 +1359,7 @@
BMFace *efa;
char *data, *bmdata;
void *datalayer;
- int index, offset, size, i;
+ int index /*, offset*/ /*UNUSED */, size, i;
datalayer = DM_get_tessface_data_layer(dm, type);
if(datalayer)
@@ -1371,7 +1371,7 @@
index = CustomData_get_layer_index(&bm->pdata, type);
if(index != -1) {
- offset = bm->pdata.layers[index].offset;
+ /* offset = bm->pdata.layers[index].offset; */ /* UNUSED */
size = CustomData_sizeof(type);
DM_add_tessface_layer(dm, type, CD_CALLOC, NULL);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -2630,7 +2630,7 @@
WeightTable wtable = {0};
MCol *mcol;
MEdge *medge = NULL;
- MFace *mface = NULL;
+ /* MFace *mface = NULL; */
MPoly *mpoly = NULL;
DM_from_template(&ccgdm->dm, dm, DM_TYPE_CCGDM,
@@ -2761,9 +2761,9 @@
edgeNum = 0;
faceNum = 0;
- /* mvert = dm->getVertArray(dm); - as yet unused */
+ /* mvert = dm->getVertArray(dm); */ /* UNUSED */
medge = dm->getEdgeArray(dm);
- mface = dm->getTessFaceArray(dm);
+ /* mface = dm->getTessFaceArray(dm); */ /* UNUSED */
mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
base_polyOrigIndex = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX);
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h 2011-09-07 06:49:20 UTC (rev 39992)
@@ -108,13 +108,13 @@
void *retval=NULL;
BLI_freenode *curnode=NULL;
char *addr=NULL;
- int j;
if (!pool) return NULL;
pool->totused++;
- if(!(pool->free)){
+ if (!(pool->free)) {
+ int j;
/*need to allocate a new chunk*/
BLI_mempool_chunk *mpchunk = pool->use_sysmalloc ? (BLI_mempool_chunk*)malloc(sizeof(BLI_mempool_chunk)) : (BLI_mempool_chunk*)MEM_mallocN(sizeof(BLI_mempool_chunk), "BLI_Mempool Chunk");
mpchunk->next = mpchunk->prev = NULL;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -175,7 +175,7 @@
BMIter verts;
BMIter faces;
BMIter loops;
- unsigned int maxlength = 0, i;
+ unsigned int maxlength = 0;
float (*projectverts)[3];
/*first, find out the largest face in mesh*/
@@ -211,9 +211,7 @@
}
/*add face normals to vertices*/
- i = 0;
BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) {
- i += 1;
if (BM_TestHFlag(f, BM_HIDDEN))
continue;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -327,11 +327,11 @@
loopWalker *lwalk = NULL, owalk;
BMEdge *e = data;
BMVert *v;
- int /* found=1, */ val;
+ /* int found=1, val; */ /* UNUSED */
v = e->v1;
- val = BM_Vert_EdgeCount(v);
+ /* val = BM_Vert_EdgeCount(v); */ /* UNUSED */
BMW_pushstate(walker);
@@ -498,8 +498,8 @@
{
faceloopWalker *lwalk, owalk;
BMEdge *e = data;
- BMesh *bm = walker->bm;
- int fcount = BM_Edge_FaceCount(e);
+ /* BMesh *bm = walker->bm; */ /* UNUSED */
+ /* int fcount = BM_Edge_FaceCount(e); */ /* UNUSED */
if (!faceloopWalker_edge_begins_loop(walker, e))
return;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -509,8 +509,9 @@
/*set edge lengths of cross edges as the average of the cross edges they're based on*/
if (has_elens) {
+#if 0 /* angle happens not to be used. why? - not sure it just isnt - campbell. leave this in incase we need to use it later */
float ang;
-
+#endif
e1 = BM_Edge_Exist(v1, v4);
e2 = BM_Edge_Exist(v2, v3);
@@ -525,15 +526,17 @@
d3 = CustomData_bmesh_get_n(&bm->edata, e1->head.data, CD_PROP_FLT, li);
d1 = *(float*)CustomData_bmesh_get_n(&bm->edata, l->prev->e->head.data, CD_PROP_FLT, li);
d2 = *(float*)CustomData_bmesh_get_n(&bm->edata, l2->e->head.data, CD_PROP_FLT, li);
-
+#if 0
ang = angle_v3v3v3(l->prev->v->co, l->v->co, BM_OtherEdgeVert(l2->e, l->v)->co);
+#endif
*d3 = (d1+d2)*0.5f;
d3 = CustomData_bmesh_get_n(&bm->edata, e2->head.data, CD_PROP_FLT, li);
d1 = *(float*)CustomData_bmesh_get_n(&bm->edata, l->next->e->head.data, CD_PROP_FLT, li);
d2 = *(float*)CustomData_bmesh_get_n(&bm->edata, l3->e->head.data, CD_PROP_FLT, li);
-
+#if 0
ang = angle_v3v3v3(BM_OtherEdgeVert(l->next->e, l->next->v)->co, l->next->v->co, BM_OtherEdgeVert(l3->e, l->next->v)->co);
+#endif
*d3 = (d1+d2)*0.5f;
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -24,7 +24,7 @@
BMLoop **loops = NULL, *lastl = NULL;
BLI_array_declare(loops);
BMLoop *l, *nl;
- BMVert *v1, *v2, **verts = NULL;
+ BMVert **verts = NULL;
BLI_array_declare(verts);
int i;
@@ -37,7 +37,6 @@
if (BMO_TestFlag(bm, f, FACE_NEW)) continue;
l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- v1 = v2 = NULL;
lastl = NULL;
for (; l; l=BMIter_Step(&liter)) {
if (BMO_TestFlag(bm, l->v, VERT_INPUT)) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -211,7 +211,7 @@
}
v1 = vt[me->mloop[mpoly->loopstart].v];
- v2 = vt[me->mloop[mpoly->loopstart+1].v];
+ /* v2 = vt[me->mloop[mpoly->loopstart+1].v]; */ /* UNUSED */ /* code below always overwrites */
if (v1 == fedges[0]->v1) v2 = fedges[0]->v2;
else {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -356,14 +356,14 @@
BMVert *eva[12];
BMIter liter;
BMLoop *l;
- float vec[3], mat[4][4], phi, phid;
+ float vec[3], mat[4][4] /* , phi, phid */;
float dia = BMO_Get_Float(op, "diameter");
int a, subdiv = BMO_Get_Int(op, "subdivisions");
BMO_Get_Mat4(op, "mat", mat);
- phid= 2.0f*(float)M_PI/subdiv;
- phi= .25f*(float)M_PI;
+ /* phid= 2.0f*(float)M_PI/subdiv; */ /* UNUSED */
+ /* phi= .25f*(float)M_PI; */ /* UNUSED */
dia/=200;
for(a=0;a<12;a++) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -467,20 +467,18 @@
*/
static void quad_2edge_split_fan(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
- subdparams *params)
+ subdparams *params)
{
BMFace *nf;
- // BMVert *v;
- BMVert *lastv;
- // BMEdge *e, *ne;
+ /* BMVert *v; */ /* UNUSED */
+ /* BMVert *lastv= verts[2]; */ /* UNUSED */
+ /* BMEdge *e, *ne; */ /* UNUSED */
int i, numcuts = params->numcuts;
-
- lastv = verts[2];
for (i=0; i<numcuts; i++) {
connect_smallest_face(bm, verts[i], verts[numcuts*2+2], &nf);
- connect_smallest_face(bm, verts[numcuts+(numcuts-i)],
- verts[numcuts*2+2], &nf);
+ connect_smallest_face(bm, verts[numcuts+(numcuts-i)],
+ verts[numcuts*2+2], &nf);
}
}
@@ -1040,9 +1038,8 @@
for (j=0; j<BLI_array_count(splits)/2; j++) {
if (splits[j*2]) {
- BMFace *nf;
-
- nf = BM_Split_Face(bmesh, face, splits[j*2]->v, splits[j*2+1]->v, &nl, NULL);
+ /* BMFace *nf= */ /* UNUSED */
+ BM_Split_Face(bmesh, face, splits[j*2]->v, splits[j*2+1]->v, &nl, NULL);
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-09-07 06:33:29 UTC (rev 39991)
+++ branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-09-07 06:49:20 UTC (rev 39992)
@@ -83,8 +83,6 @@
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
BMVert *v1, *v2, *v3, *v4;
- float len1, len2, len3, len4, len5, len6, opp1, opp2, fac1, fac2;
- int ok;
if (BM_Edge_FaceCount(e) != 2 || BMO_TestFlag(bm, e, EDGE_MARK))
continue;
@@ -97,6 +95,7 @@
v4 = e->l->next->v;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list