From ff7bde2a2f2e20600460e96dc9181330d08ed0ba Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Sun, 28 Aug 2011 21:20:10 +0000 Subject: [PATCH] brought back some unused variables removed from previous commit, commented out, in case need their values later --- source/blender/blenkernel/intern/editderivedbmesh.c | 2 ++ source/blender/blenkernel/intern/multires.c | 1 + source/blender/blenkernel/intern/subsurf_ccg.c | 5 +++++ source/blender/bmesh/operators/connectops.c | 1 + source/blender/makesrna/intern/rna_mesh.c | 2 ++ source/blender/modifiers/intern/MOD_solidify.c | 1 + 6 files changed, 12 insertions(+) diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c index f783e2ab8a7..9098ce248e0 100644 --- a/source/blender/blenkernel/intern/editderivedbmesh.c +++ b/source/blender/blenkernel/intern/editderivedbmesh.c @@ -1301,6 +1301,7 @@ static void bmDM_copyFaceArray(DerivedMesh *dm, MFace *face_r) static void bmDM_copyLoopArray(DerivedMesh *dm, MLoop *loop_r) { + /* EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm; */ /* UNUSED */ BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm; BMIter iter, liter; BMVert *v; @@ -1331,6 +1332,7 @@ static void bmDM_copyLoopArray(DerivedMesh *dm, MLoop *loop_r) static void bmDM_copyPolyArray(DerivedMesh *dm, MPoly *poly_r) { + /* EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm; */ /* UNUSED */ BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm; BMIter iter; BMFace *f; diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index b76199f476e..b67969f9b38 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -972,6 +972,7 @@ void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to) for(S = 0; S < numVerts; ++S, ++gIndex, ++k) { MDisps *mdisp = &mdisps[mpoly[i].loopstart+S]; + /* DMGridData *grid = gridData[gIndex]; */ /* UNUSED */ DMGridData *subgrid = subGridData[gIndex]; float (*dispgrid)[3] = NULL; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 8cacb87ba38..5a96ce295fb 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -499,6 +499,7 @@ static int ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm, BLI_array_declare(fVerts); MVert *mvert = dm->getVertArray(dm); MEdge *medge = dm->getEdgeArray(dm); + /* MFace *mface = dm->getTessFaceArray(dm); */ /* UNUSED */ MVert *mv; MEdge *me; MLoop *mloop = dm->getLoopArray(dm), *ml; @@ -1112,6 +1113,7 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) int edgeSize = ccgSubSurf_getEdgeSize(ss); int i = 0; MLoop *mv; + /* char *faceFlags = cgdm->faceFlags; */ /* UNUSED */ if (!cgdm->ehash) { MEdge *medge; @@ -1129,6 +1131,8 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) for(index = 0; index < totface; index++) { CCGFace *f = cgdm->faceMap[index].face; int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f); + /* int flag = (faceFlags)? faceFlags[index*2]: ME_SMOOTH; */ /* UNUSED */ + /* int mat_nr = (faceFlags)? faceFlags[index*2+1]: 0; */ /* UNUSED */ for(S = 0; S < numVerts; S++) { for(y = 0; y < gridSize - 1; y++) { @@ -1174,6 +1178,7 @@ static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mface) int index; int totface; int gridSize = ccgSubSurf_getGridSize(ss); + /* int edgeSize = ccgSubSurf_getEdgeSize(ss); */ /* UNUSED */ int i = 0, k = 0; char *faceFlags = cgdm->faceFlags; diff --git a/source/blender/bmesh/operators/connectops.c b/source/blender/bmesh/operators/connectops.c index c6b2e2a8d56..adc3b7c6fe4 100644 --- a/source/blender/bmesh/operators/connectops.c +++ b/source/blender/bmesh/operators/connectops.c @@ -142,6 +142,7 @@ void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op) BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) { if (!BMO_TestFlag(bm, e, EDGE_DONE)) { BMVert *v, *ov; + /* BMEdge *e2, *e3, *oe = e; */ /* UNUSED */ BMEdge *e2, *e3; if (c > 2) { diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 64d6185e390..cba5f61b59c 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -606,6 +606,7 @@ static void rna_MeshTextureFaceLayer_clone_set(PointerRNA *ptr, int value) static void rna_MeshTextureFaceLayer_name_set(PointerRNA *ptr, const char *value) { Mesh *me= (Mesh*)ptr->id.data; + /* CustomData *fdata= rna_mesh_pdata(me); */ /* UNUSED */ CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy(cdl->name, value, sizeof(cdl->name)); CustomData_set_layer_unique_name(&me->pdata, cdl - rna_mesh_pdata(me)->layers); @@ -722,6 +723,7 @@ static void rna_MeshColorLayer_active_set(PointerRNA *ptr, int value) static void rna_MeshColorLayer_name_set(PointerRNA *ptr, const char *value) { Mesh *me= (Mesh*)ptr->id.data; + /* CustomData *fdata= rna_mesh_pdata(me); */ /* UNUSED */ CustomDataLayer *cdl= (CustomDataLayer*)ptr->data; BLI_strncpy(cdl->name, value, sizeof(cdl->name)); CustomData_set_layer_unique_name(&me->ldata, cdl - rna_mesh_ldata(me)->layers); diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 5a4af851b78..a56fe7aa960 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -215,6 +215,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* only use material offsets if we have 2 or more materials */ const short mat_nr_max= ob->totcol > 1 ? ob->totcol - 1 : 0; const short mat_ofs= mat_nr_max ? smd->mat_ofs : 0; + /* const short mat_ofs_rim= mat_nr_max ? smd->mat_ofs_rim : 0; */ /* UNUSED */ /* use for edges */ int *new_vert_arr= NULL;