Revision: 44268
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44268
Author: campbellbarton
Date: 2012-02-19 22:28:50 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
missed cleaning up ScanFillEdge last commit
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_scanfill.h
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
Modified: trunk/blender/source/blender/blenlib/BLI_scanfill.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_scanfill.h 2012-02-19 22:17:30 UTC
(rev 44267)
+++ trunk/blender/source/blender/blenlib/BLI_scanfill.h 2012-02-19 22:28:50 UTC
(rev 44268)
@@ -67,24 +67,8 @@
{
struct ScanFillEdge *next, *prev;
struct ScanFillVert *v1, *v2;
- union {
- /* some lean storage for temporary usage
- * in editmesh routines
- */
- struct ScanFillVert *v;
- struct ScanFillEdge *e;
- struct ScanFillFace *f;
- void *p;
- intptr_t l;
- float fp;
- } tmp;
- short f1, f2; /* short, f1 is (ab)used in subdiv */
- unsigned char f, h, dir, seam, sharp;
- float crease;
- float bweight;
- short fast; /* only 0 or 1, for editmesh_fastmalloc */
- short fgoni; /* index for fgon, for search */
- void *data; /*custom edge data*/
+ short poly_nr;
+ unsigned char f;
} ScanFillEdge;
typedef struct ScanFillFace
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-02-19
22:17:30 UTC (rev 44267)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-02-19
22:28:50 UTC (rev 44268)
@@ -281,7 +281,7 @@
}
eed= filledgebase.first;
while(eed) {
- if(eed->f1== pf2->nr) eed->f1= pf1->nr;
+ if (eed->poly_nr == pf2->nr) eed->poly_nr = pf1->nr;
eed= eed->next;
}
@@ -434,7 +434,7 @@
}
eed= filledgebase.first;
while(eed) {
- if(eve!=eed->v1 && eve!=eed->v2 &&
eve->poly_nr==eed->f1) {
+ if (eve != eed->v1 && eve != eed->v2 &&
eve->poly_nr == eed->poly_nr) {
if(compare_v3v3(eve->co,eed->v1->co,
COMPLIMIT)) {
ed1->v2= eed->v1;
eed->v1->h++;
@@ -459,8 +459,8 @@
ed1=
BLI_addfilledge(eed->v1, eve);
/*
printf("fill: vertex near edge %x\n",eve); */
- ed1->f= ed1->h=
0;
- ed1->f1=
eed->f1;
+ ed1->f= 0;
+ ed1->poly_nr =
eed->poly_nr;
eed->v1= eve;
eve->h= 3;
break;
@@ -496,7 +496,7 @@
eed= temped->first;
while(eed) {
nexted= eed->next;
- if(eed->f1==nr) {
+ if(eed->poly_nr==nr) {
BLI_remlink(temped,eed);
BLI_addtail(&filledgebase,eed);
}
@@ -835,7 +835,7 @@
/* including resetting of flags */
eed= filledgebase.first;
while(eed) {
- eed->f1= eed->h= 0;
+ eed->poly_nr= 0;
eed->v1->f= 1;
eed->v2->f= 1;
@@ -908,17 +908,17 @@
while(eed) {
if (eed->v1->poly_nr == 0 &&
eed->v2->poly_nr == poly) {
eed->v1->poly_nr = poly;
- eed->f1= poly;
+ eed->poly_nr= poly;
ok= 1;
}
else if (eed->v2->poly_nr == 0 &&
eed->v1->poly_nr == poly) {
eed->v2->poly_nr = poly;
- eed->f1= poly;
+ eed->poly_nr= poly;
ok= 1;
}
- else if (eed->f1 == 0) {
+ else if (eed->poly_nr == 0) {
if (eed->v1->poly_nr == poly &&
eed->v2->poly_nr == poly) {
- eed->f1= poly;
+ eed->poly_nr= poly;
ok= 1;
}
}
@@ -999,7 +999,7 @@
}
eed= filledgebase.first;
while(eed) {
- pflist[eed->f1-1].edges++;
+ pflist[eed->poly_nr-1].edges++;
eed= eed->next;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
2012-02-19 22:17:30 UTC (rev 44267)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
2012-02-19 22:28:50 UTC (rev 44268)
@@ -185,7 +185,7 @@
v1 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v1);
v2 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v2);
eed = BLI_addfilledge(v1, v2);
- eed->tmp.p = e;
+ /* eed->tmp.p = e; */ /* UNUSED */
}
BLI_edgefill(0);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
