[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45673] trunk/blender/source/blender: code cleanup: avoid confusion with incorrectly named argument to BLI_edgefill(), was ' mat_nr', now 'do_quad_tri_speedup'
Campbell Barton
ideasman42 at gmail.com
Mon Apr 16 07:03:04 CEST 2012
Revision: 45673
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45673
Author: campbellbarton
Date: 2012-04-16 05:03:04 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
code cleanup: avoid confusion with incorrectly named argument to BLI_edgefill(), was 'mat_nr', now 'do_quad_tri_speedup'
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
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
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -472,7 +472,7 @@
dl= dl->next;
}
- if (totvert && (tot= BLI_edgefill(0))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
+ if (totvert && (tot= BLI_edgefill(FALSE))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
if (tot) {
dlnew= MEM_callocN(sizeof(DispList), "filldisplist");
dlnew->type= DL_INDEX3;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -216,7 +216,7 @@
/*complete the loop*/
BLI_addfilledge(firstv, v);
- totfilltri = BLI_edgefill(2);
+ totfilltri = BLI_edgefill(FALSE);
BLI_array_growitems(looptris, totfilltri);
for (efa = fillfacebase.first; efa; efa=efa->next) {
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -2478,7 +2478,7 @@
}
BLI_addfilledge(lastv, firstv);
- totfilltri = BLI_edgefill(2);
+ totfilltri = BLI_edgefill(FALSE);
if (totfilltri) {
BLI_array_growitems(mface_to_poly_map, totfilltri);
BLI_array_growitems(mface, totfilltri);
Modified: trunk/blender/source/blender/blenlib/BLI_scanfill.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_scanfill.h 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/blenlib/BLI_scanfill.h 2012-04-16 05:03:04 UTC (rev 45673)
@@ -86,7 +86,7 @@
#define FILLBOUNDARY 1
int BLI_begin_edgefill(void);
-int BLI_edgefill(short mat_nr);
+int BLI_edgefill(const short do_quad_tri_speedup);
void BLI_end_edgefill(void);
/* These callbacks are needed to make the lib finction properly */
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -792,7 +792,7 @@
return 1;
}
-int BLI_edgefill(short mat_nr)
+int BLI_edgefill(const short do_quad_tri_speedup)
{
/*
* - fill works with its own lists, so create that first (no faces!)
@@ -821,34 +821,28 @@
a += 1;
}
- if (a == 3 && (mat_nr & 2)) {
+ if (do_quad_tri_speedup && (a == 3)) {
eve = fillvertbase.first;
addfillface(eve, eve->next, eve->next->next);
return 1;
}
- else if (a == 4 && (mat_nr & 2)) {
+ else if (do_quad_tri_speedup && (a == 4)) {
float vec1[3], vec2[3];
eve = fillvertbase.first;
/* no need to check 'eve->next->next->next' is valid, already counted */
- if (1) { //BMESH_TODO) {
- /*use shortest diagonal for quad*/
- sub_v3_v3v3(vec1, eve->co, eve->next->next->co);
- sub_v3_v3v3(vec2, eve->next->co, eve->next->next->next->co);
-
- if (dot_v3v3(vec1, vec1) < dot_v3v3(vec2, vec2)) {
- addfillface(eve, eve->next, eve->next->next);
- addfillface(eve->next->next, eve->next->next->next, eve);
- }
- else {
- addfillface(eve->next, eve->next->next, eve->next->next->next);
- addfillface(eve->next->next->next, eve, eve->next);
- }
+ /*use shortest diagonal for quad*/
+ sub_v3_v3v3(vec1, eve->co, eve->next->next->co);
+ sub_v3_v3v3(vec2, eve->next->co, eve->next->next->next->co);
+
+ if (dot_v3v3(vec1, vec1) < dot_v3v3(vec2, vec2)) {
+ addfillface(eve, eve->next, eve->next->next);
+ addfillface(eve->next->next, eve->next->next->next, eve);
}
else {
- addfillface(eve, eve->next, eve->next->next);
- addfillface(eve->next->next, eve->next->next->next, eve);
+ addfillface(eve->next, eve->next->next, eve->next->next->next);
+ addfillface(eve->next->next->next, eve, eve->next);
}
return 2;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -194,7 +194,7 @@
/* eed->tmp.p = e; */ /* UNUSED */
}
- BLI_edgefill(0);
+ BLI_edgefill(FALSE);
for (efa = fillfacebase.first; efa; efa = efa->next) {
BMFace *f = BM_face_create_quad_tri(bm,
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -1873,7 +1873,7 @@
}
}
- BLI_edgefill(0);
+ BLI_edgefill(FALSE);
for (efa = fillfacebase.first; efa; efa = efa->next) {
BMVert *v1 = efa->v3->tmp.p, *v2 = efa->v2->tmp.p, *v3 = efa->v1->tmp.p;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -286,9 +286,8 @@
}
BLI_addfilledge(firstv, v);
-
- /* mode 2 enables faster handling of tri/quads */
- BLI_edgefill(2);
+
+ BLI_edgefill(TRUE);
for (sefa = fillfacebase.first; sefa; sefa = sefa->next) {
ls[0] = sefa->v1->tmp.p;
ls[1] = sefa->v2->tmp.p;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_gesture.c 2012-04-16 04:17:33 UTC (rev 45672)
+++ trunk/blender/source/blender/windowmanager/intern/wm_gesture.c 2012-04-16 05:03:04 UTC (rev 45673)
@@ -253,7 +253,7 @@
/* highly unlikely this will fail, but could crash if (gt->points == 0) */
if (firstv) {
BLI_addfilledge(firstv, v);
- BLI_edgefill(0);
+ BLI_edgefill(FALSE);
glEnable(GL_BLEND);
glColor4f(1.0, 1.0, 1.0, 0.05);
More information about the Bf-blender-cvs
mailing list