brought back some unused variables removed from previous commit, commented out, in...
authorHoward Trickey <howard.trickey@gmail.com>
Sun, 28 Aug 2011 21:20:10 +0000 (21:20 +0000)
committerHoward Trickey <howard.trickey@gmail.com>
Sun, 28 Aug 2011 21:20:10 +0000 (21:20 +0000)
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/bmesh/operators/connectops.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/modifiers/intern/MOD_solidify.c

index f783e2ab8a72800f3a56146757804e69a753fbcc..9098ce248e09d5d1b81dcb6e540dc1d45117f126 100644 (file)
@@ -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;
index b76199f476ec094c1a603bec891e9b588c597f5e..b67969f9b38ea856c58d350c03225abc267cc4b9 100644 (file)
@@ -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;
 
index 8cacb87ba382733f334ee356c4d1bfe6fd3a5391..5a96ce295fbf4f06fd7232540e0ea42e1058cce9 100644 (file)
@@ -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;
 
index c6b2e2a8d56618ee851b9d2ea95a3a1d31d66e6a..adc3b7c6fe48d83c8479f5bd982f7c7804a44f92 100644 (file)
@@ -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) {
index 64d6185e390825b9be5761eec09a8f51e597bacd..cba5f61b59c57b32cdd15f749d0d2898bedd8de0 100644 (file)
@@ -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);
index 5a4af851b781d1ab9db19c54274e75c3458e3882..a56fe7aa96078026671d388c023f1a8d876d9c6c 100644 (file)
@@ -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;