Revision: 39758
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39758
Author: howardt
Date: 2011-08-28 21:20:10 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
brought back some unused variables removed from previous commit, commented out,
in case need their values later
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.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/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -1301,6 +1301,7 @@
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_copyPolyArray(DerivedMesh *dm, MPoly *poly_r)
{
+ /* EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm; */ /* UNUSED */
BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm;
BMIter iter;
BMFace *f;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -972,6 +972,7 @@
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;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -499,6 +499,7 @@
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 @@
int edgeSize = ccgSubSurf_getEdgeSize(ss);
int i = 0;
MLoop *mv;
+ /* char *faceFlags = cgdm->faceFlags; */ /* UNUSED */
if (!cgdm->ehash) {
MEdge *medge;
@@ -1129,6 +1131,8 @@
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 @@
int index;
int totface;
int gridSize = ccgSubSurf_getGridSize(ss);
+ /* int edgeSize = ccgSubSurf_getEdgeSize(ss); */ /* UNUSED */
int i = 0, k = 0;
char *faceFlags = cgdm->faceFlags;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -142,6 +142,7 @@
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) {
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -606,6 +606,7 @@
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_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);
Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
2011-08-28 21:13:03 UTC (rev 39757)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
2011-08-28 21:20:10 UTC (rev 39758)
@@ -215,6 +215,7 @@
/* 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;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
