[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36663] branches/bmesh/blender/source/ blender: fix for last commit and remove some unused variables.
Campbell Barton
ideasman42 at gmail.com
Fri May 13 13:34:55 CEST 2011
Revision: 36663
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36663
Author: campbellbarton
Date: 2011-05-13 11:34:55 +0000 (Fri, 13 May 2011)
Log Message:
-----------
fix for last commit and remove some unused variables.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.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/dissolveops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -358,7 +358,6 @@
void DM_DupPolys(DerivedMesh *source, DerivedMesh *target)
{
DMFaceIter *iter = source->newFaceIter(source);
- DMLoopIter *liter;
int totloop = source->numLoopData;
dm_add_polys_from_iter(&target->loopData, &target->polyData, source, totloop);
@@ -921,7 +920,7 @@
static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm)
{
- Mesh *me = ob->data;
+ // Mesh *me = ob->data; // UNUSED
MFace *mf = dm->getTessFaceArray(dm);
DMFaceIter *dfiter;
DMLoopIter *dliter;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -121,7 +121,6 @@
static BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv, BMEdge *starte) {
BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, f, NULL);
- int i;
bmesh_radial_append(starte, l);
@@ -356,8 +355,6 @@
}
static void bmesh_kill_loop(BMesh *bm, BMLoop *l) {
- int i;
-
bm->totloop--;
if (l->head.data)
CustomData_bmesh_free_block(&bm->ldata, &l->head.data);
@@ -407,8 +404,7 @@
void BM_Kill_Face(BMesh *bm, BMFace *f) {
BMLoopList *ls, *lsnext;
- int i;
-
+
CHECK_ELEMENT(bm, f);
for (ls=f->loops.first; ls; ls=lsnext) {
@@ -442,8 +438,7 @@
}
void BM_Kill_Edge(BMesh *bm, BMEdge *e) {
- int i;
-
+
bmesh_disk_remove_edge(e, e->v1);
bmesh_disk_remove_edge(e, e->v2);
@@ -934,7 +929,7 @@
BMLoop **rl, ListBase *holes)
{
- BMFace *f2, *of1, *of2;
+ BMFace *f2;
BMLoop *v1loop = NULL, *v2loop = NULL, *curloop, *f1loop=NULL, *f2loop=NULL;
BMEdge *e;
BMLoopList *lst, *lst2;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -140,8 +140,8 @@
#endif
}
-#define ETAG_SET(e, v, nv) (v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1 = (nv)) : (etags[BMINDEX_GET((e))].newv2 = (nv))
-#define ETAG_GET(e, v) ((v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1) : (etags[BMINDEX_GET((e))].newv2))
+#define ETAG_SET(e, v, nv) (v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1 = (nv)) : (etags[BM_GetIndex((e))].newv2 = (nv))
+#define ETAG_GET(e, v) ((v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1) : (etags[BM_GetIndex((e))].newv2))
void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
{
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -335,7 +335,8 @@
BMEdge *e;
BMEdge **edges = NULL;
BLI_array_staticdeclare(edges, 256);
- BMVert *v, *lastv, **verts = NULL;
+ BMVert *v, *lastv;
+ /*BMVert **verts = NULL; */
/*BLI_array_staticdeclare(verts, 256);*/ /*UNUSED*/
int i;
@@ -655,6 +656,7 @@
w += edata[BM_GetIndex(node->e)].ftag;
if (node->prev) {
/*BMESH_TODO*/
+ (void)first;
//w += len_v3v3(node->v->co, first->e->v1->co)*0.0001f;
//w += len_v3v3(node->v->co, first->e->v2->co)*0.0001f;
}
@@ -682,7 +684,7 @@
static EPath *edge_find_shortest_path(BMesh *bm, BMOperator *op, BMEdge *edge, EdgeData *edata,
VertData *vdata, PathBase *pathbase, int group)
{
- BMEdge *e, *starte;
+ BMEdge *e;
GHash *gh = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "createops find shortest path");
BMVert *v1, *v2;
BMVert **verts = NULL;
@@ -988,8 +990,7 @@
void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
{
BMOIter siter;
- BMIter iter;
- BMEdge *e, *e2;
+ BMEdge *e;
BMEdge **edges1 = NULL, **edges2 = NULL, **edges;
BLI_array_declare(edges1);
BLI_array_declare(edges2);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -50,15 +50,13 @@
void dissolvefaces_exec(BMesh *bm, BMOperator *op)
{
BMOIter oiter;
- BMIter liter, liter2, liter3;
- BMLoop *l, *l2, *l3;
BMFace *f, *f2 /* , *nf = NULL */;
BLI_array_declare(faces);
BLI_array_declare(regions);
BMFace ***regions = NULL;
BMFace **faces = NULL;
BMWalker regwalker;
- int i, j, fcopied;
+ int i;
BMO_Flag_Buffer(bm, op, "faces", FACE_MARK, BM_FACE);
Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2011-05-13 11:34:55 UTC (rev 36663)
@@ -901,7 +901,7 @@
{
Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
- BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
+ /* BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh; */ /*UNUSED*/
ParamHandle *handle;
int method = RNA_enum_get(op->ptr, "method");
int fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
@@ -1066,7 +1066,6 @@
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
- MTexPoly *tf;
MLoopUV *luv;
BLI_array_declare(uvs);
float **uvs = NULL;
More information about the Bf-blender-cvs
mailing list