[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36668] branches/bmesh/blender/source/ blender: remove unused vars
Campbell Barton
ideasman42 at gmail.com
Fri May 13 15:17:30 CEST 2011
Revision: 36668
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36668
Author: campbellbarton
Date: 2011-05-13 13:17:30 +0000 (Fri, 13 May 2011)
Log Message:
-----------
remove unused vars
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenlib/BLI_array.h
branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/util/crazyspace.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -890,7 +890,7 @@
{
float *co = dest, *src;
float **in = (float **)sources;
- int i, j, k;
+ int i;
if(count <= 0) return;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -743,7 +743,7 @@
BMLoop **ls = em->looptris[i];
MTexPoly *tp= CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY);
MTFace mtf = {{{0}}};
- unsigned char *cp= NULL;
+ /*unsigned char *cp= NULL;*/ /*UNUSED*/
int drawSmooth= BM_TestHFlag(ls[0]->f, BM_SMOOTH);
int flag;
@@ -818,7 +818,7 @@
BMLoop **ls = em->looptris[i];
MTexPoly *tp= CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY);
MTFace mtf = {{{0}}};
- unsigned char *cp= NULL;
+ /*unsigned char *cp= NULL;*/ /*UNUSED*/
int drawSmooth= BM_TestHFlag(ls[0]->f, BM_SMOOTH);
int flag;
@@ -939,8 +939,8 @@
DMVertexAttribs attribs;
GPUVertexAttribs gattribs;
MTexPoly *tp;
- int transp, new_transp, orig_transp, tfoffset;
- int i, b, matnr, new_matnr, dodraw, layer;
+ int transp, new_transp, orig_transp;
+ int i, b, matnr, new_matnr, dodraw;
dodraw = 0;
matnr = -1;
@@ -1572,7 +1572,6 @@
{
EditDerivedBMesh *bmdm = MEM_callocN(sizeof(*bmdm), "bmdm");
BMesh *bm = em->bm;
- int i;
bmdm->tc = em;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -2388,7 +2388,7 @@
MVert *v1, *v2, *v3;
double u[3], v[3], w[3];
double n[3] = {0.0, 0.0, 0.0}, l;
- int i, s=0;
+ int i;
for(i = 0; i < mpoly->totloop; i++){
v1 = mvert + loopstart[i].v;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/multires.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/multires.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -401,7 +401,7 @@
if(mdisps && levels > 0) {
if(lvl > 0) {
- MLoop *ml = me->mloop;
+ /* MLoop *ml = me->mloop; */ /*UNUSED*/
int nsize = multires_side_tot[lvl];
int hsize = multires_side_tot[mmd->totlvl];
int i, j;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -499,8 +499,8 @@
BLI_array_declare(fVerts);
int totvert = dm->getNumVerts(dm);
int totedge = dm->getNumEdges(dm);
- int totface = dm->getNumTessFaces(dm);
- int totpoly = dm->getNumFaces(dm);
+ /*int totface = dm->getNumTessFaces(dm);*/ /*UNUSED*/
+ /*int totpoly = dm->getNumFaces(dm);*/ /*UNUSED*/
int i;
int *index;
MVert *mvert = dm->getVertArray(dm);
@@ -508,7 +508,7 @@
MFace *mface = dm->getTessFaceArray(dm);
MVert *mv;
MEdge *me;
- MFace *mf;
+ /*MFace *mf;*/ /*UNUSED*/
DMFaceIter *fiter;
DMLoopIter *liter;
@@ -851,7 +851,7 @@
int offset;
int grid;
int x, y;
- int lastface = ccgSubSurf_getNumFaces(ss) - 1;
+ /*int lastface = ccgSubSurf_getNumFaces(ss) - 1;*/ /*UNUSED*/
char *faceFlags = cgdm->faceFlags;
memset(mf, 0, sizeof(*mf));
@@ -1085,7 +1085,7 @@
static void cgdm_loopIterStep(void *self)
{
cgdm_loopIter *liter = self;
- MFace *mf = liter->fiter->mface;
+ /* MFace *mf = liter->fiter->mface; */ /*UNUSED*/
int i, v1, v2;
liter->head.index++;
@@ -1162,8 +1162,8 @@
static DMFaceIter *cgdm_newFaceIter(DerivedMesh *dm)
{
cgdm_faceIter *fiter = MEM_callocN(sizeof(cgdm_faceIter), "cgdm_faceIter");
- MEdge medge;
- int i, totedge = cgdm_getNumEdges(dm);
+ /*MEdge medge;*/ /*UNUSED*/
+ /*int totedge = cgdm_getNumEdges(dm);*/ /*UNUSED*/
fiter->cgdm = (CCGDerivedMesh *)dm;
fiter->liter.cgdm = (CCGDerivedMesh *)dm;
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_array.h 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_array.h 2011-05-13 13:17:30 UTC (rev 36668)
@@ -87,7 +87,7 @@
/*grow an array by a specified number of items.*/
#define BLI_array_growitems(arr, num) {int _i; for (_i=0; _i<(num); _i++) {BLI_array_growone(arr);}}
-#define BLI_array_free(arr) if (arr && (char *)arr != _##arr##_static) MEM_freeN(arr)
+#define BLI_array_free(arr) if (arr && (char *)arr != _##arr##_static) { BLI_array_fake_user(arr); MEM_freeN(arr); }
#define BLI_array_pop(arr) ((arr&&_##arr##_count) ? arr[--_##arr##_count] : 0)
/*resets the logical size of an array to zero, but doesn't
@@ -97,3 +97,6 @@
/*set the count of the array, doesn't actually increase the allocated array
size. don't use this unless you know what you're doing.*/
#define BLI_array_set_length(arr, count) _##arr##_count = (count)
+
+/*only to prevent unused warnings*/
+#define BLI_array_fake_user(arr) (void)_##arr##_count, (void)_##arr##_tmp, (void)_##arr##_static
Modified: branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -158,7 +158,7 @@
printf("incorrect use of new_mem_element\n");
}
else if(size== -1) {
- /*keep the first block*/
+ /*BMESH_TODO: keep the first block, gives memory leak on exit with 'newmem' */
first = lb.first;
BLI_remlink(&lb, first);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -520,7 +520,7 @@
{
MDisps *mdisps;
BMLoop *l2;
- double x, y, d, v1[3], v2[3], v3[3], v4[3] = {0.0f, 0.0f, 0.0f}, e1[3], e2[3], e3[3], e4[3];
+ double x, y, d, v1[3], v2[3], v3[3], v4[3] = {0.0f, 0.0f, 0.0f}, e1[3], e2[3];
int ix, iy, res;
/*ignore 2-edged faces*/
@@ -603,7 +603,7 @@
MDisps *mdp = CustomData_bmesh_get(&bm->ldata, l->prev->head.data, CD_MDISPS);
MDisps *mdl = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MDISPS);
MDisps *mdn = CustomData_bmesh_get(&bm->ldata, l->next->head.data, CD_MDISPS);
- float co1[3], co2[3], co[3];
+ float co1[3];
int sides;
int y;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -346,7 +346,7 @@
*/
void BM_Collapse_Vert(BMesh *bm, BMEdge *ke, BMVert *kv, float fac){
- BMFace **faces = NULL, **oldfaces=NULL, *f;
+ BMFace **faces = NULL, *f;
BLI_array_staticdeclare(faces, 8);
BMIter iter;
BMLoop *l=NULL, *kvloop=NULL, *tvloop=NULL;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -443,7 +443,6 @@
for (i=0; i<BLI_array_count(faces); i++) {
BMLoop *l;
BMIter liter;
- BMVert *lastv=NULL, *firstv=NULL;
int j;
/*create quad spans between split edges*/
@@ -498,7 +497,7 @@
if (v1 != v2 && v2 != v3 && v3 != v4) {
BMIter liter2;
BMLoop *l2, *l3;
- BMEdge *e1, *e2, *e3, *e4;
+ BMEdge *e1, *e2;
float d1, d2, *d3;
f = BM_Make_QuadTri(bm, v4, v3, v2, v1, l->f, 1);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -335,7 +335,7 @@
BMEdge *e;
BMEdge **edges = NULL;
BLI_array_staticdeclare(edges, 256);
- BMVert *v, *lastv;
+ BMVert *v;
/*BMVert **verts = NULL; */
/*BLI_array_staticdeclare(verts, 256);*/ /*UNUSED*/
int i;
@@ -532,6 +532,7 @@
#if 0
/*create visualizing geometry*/
+ BMVert *lastv;
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
BMVert *v2;
BMFace *f;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-05-13 12:57:54 UTC (rev 36667)
+++ branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2011-05-13 13:17:30 UTC (rev 36668)
@@ -82,7 +82,7 @@
stop = 1;
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
- BMVert *v1, *v2, *v3, *v4, *d1, *d2;
+ BMVert *v1, *v2, *v3, *v4;
float len1, len2, len3, len4, len5, len6, opp1, opp2, fac1, fac2;
int ok;
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list