[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44583] trunk/blender/source/blender/bmesh : Code Cleanup: remove bmesh_radial_loop_next() function,
Campbell Barton
ideasman42 at gmail.com
Thu Mar 1 18:13:11 CET 2012
Revision: 44583
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44583
Author: campbellbarton
Date: 2012-03-01 17:13:02 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Code Cleanup: remove bmesh_radial_loop_next() function,
just access l->radial_next
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -789,7 +789,7 @@
}
i += BM_ELEM_API_FLAG_TEST(l2->f, flag) ? 1 : 0;
- l2 = bmesh_radial_loop_next(l2);
+ l2 = l2->radial_next;
if (UNLIKELY(c >= BM_LOOP_RADIAL_MAX)) {
BMESH_ASSERT(0);
goto error;
@@ -1452,7 +1452,7 @@
radlen = bmesh_radial_length(ke->l);
if (ke->l) {
/* first step, fix the neighboring loops of all loops in ke's radial cycl */
- for (i = 0, killoop = ke->l; i < radlen; i++, killoop = bmesh_radial_loop_next(killoop)) {
+ for (i = 0, killoop = ke->l; i < radlen; i++, killoop = killoop->radial_next) {
/* relink loops and fix vertex pointer */
if (killoop->next->v == kv) {
killoop->next->v = tv;
@@ -1481,7 +1481,7 @@
/* this should be wrapped into a bme_free_radial function to be used by bmesh_KF as well.. */
for (i = 0; i < radlen; i++) {
loops[i] = killoop;
- killoop = bmesh_radial_loop_next(killoop);
+ killoop = killoop->radial_next;
}
for (i = 0; i < radlen; i++) {
bm->totloop--;
@@ -1508,7 +1508,7 @@
BMESH_ASSERT(edok != FALSE);
/* Validate loop cycle of all faces attached to o */
- for (i = 0, l = oe->l; i < radlen; i++, l = bmesh_radial_loop_next(l)) {
+ for (i = 0, l = oe->l; i < radlen; i++, l = l->radial_next) {
BMESH_ASSERT(l->e == oe);
edok = bmesh_verts_in_edge(l->v, l->next->v, oe);
BMESH_ASSERT(edok != FALSE);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -291,11 +291,13 @@
{
BMLoop *current = iter->nextloop;
- if (iter->nextloop)
- iter->nextloop = bmesh_radial_loop_next(iter->nextloop);
+ if (iter->nextloop) {
+ iter->nextloop = iter->nextloop->radial_next;
+ }
- if (iter->nextloop == iter->firstloop)
+ if (iter->nextloop == iter->firstloop) {
iter->nextloop = NULL;
+ }
if (current) {
return current;
@@ -314,7 +316,7 @@
init_iterator(iter);
iter->firstloop = l;
- iter->nextloop = bmesh_radial_loop_next(iter->firstloop);
+ iter->nextloop = iter->firstloop->radial_next;
if (iter->nextloop == iter->firstloop)
iter->nextloop = NULL;
@@ -324,9 +326,13 @@
{
BMLoop *current = iter->nextloop;
- if (iter->nextloop) iter->nextloop = bmesh_radial_loop_next(iter->nextloop);
+ if (iter->nextloop) {
+ iter->nextloop = iter->nextloop->radial_next;
+ }
- if (iter->nextloop == iter->firstloop) iter->nextloop = NULL;
+ if (iter->nextloop == iter->firstloop) {
+ iter->nextloop = NULL;
+ }
if (current) {
return current;
@@ -353,7 +359,9 @@
{
BMLoop *current = iter->nextloop;
- if (iter->nextloop) iter->nextloop = bmesh_radial_loop_next(iter->nextloop);
+ if (iter->nextloop) {
+ iter->nextloop = iter->nextloop->radial_next;
+ }
if (iter->nextloop == iter->firstloop) iter->nextloop = NULL;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -204,13 +204,16 @@
int BM_edge_face_count(BMEdge *e)
{
int count = 0;
- BMLoop *l_iter = NULL;
if (e->l) {
- l_iter = e->l;
+ BMLoop *l_iter;
+ BMLoop *l_first;
+
+ l_iter = l_first = e->l;
+
do {
count++;
- } while ((l_iter = bmesh_radial_loop_next(l_iter)) != e->l);
+ } while ((l_iter = l_iter->radial_next) != l_first);
}
return count;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -131,7 +131,6 @@
* Functions relating to this cycle:
* - #bmesh_radial_append
* - #bmesh_radial_loop_remove
- * - #bmesh_radial_loop_next
* - #bmesh_radial_face_find
* - #bmesh_radial_facevert_count
* - #bmesh_radial_faceloop_find_first
@@ -379,7 +378,7 @@
}
i++;
- } while ((l_iter = bmesh_radial_loop_next(l_iter)) != l);
+ } while ((l_iter = l_iter->radial_next) != l);
return TRUE;
}
@@ -438,27 +437,22 @@
if (l_iter->v == v) {
return l_iter;
}
- } while ((l_iter = bmesh_radial_loop_next(l_iter)) != l);
+ } while ((l_iter = l_iter->radial_next) != l);
return NULL;
}
BMLoop *bmesh_radial_faceloop_find_next(BMLoop *l, BMVert *v)
{
BMLoop *l_iter;
- l_iter = bmesh_radial_loop_next(l);
+ l_iter = l->radial_next;
do {
if (l_iter->v == v) {
return l_iter;
}
- } while ((l_iter = bmesh_radial_loop_next(l_iter)) != l);
+ } while ((l_iter = l_iter->radial_next) != l);
return l;
}
-BMLoop *bmesh_radial_loop_next(BMLoop *l)
-{
- return l->radial_next;
-}
-
int bmesh_radial_length(BMLoop *l)
{
BMLoop *l_iter = l;
@@ -536,7 +530,7 @@
if (l_iter->v == v) {
count++;
}
- } while ((l_iter = bmesh_radial_loop_next(l_iter)) != l);
+ } while ((l_iter = l_iter->radial_next) != l);
return count;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.h 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.h 2012-03-01 17:13:02 UTC (rev 44583)
@@ -56,7 +56,10 @@
/* RADIAL CYCLE MANAGMENT */
void bmesh_radial_append(BMEdge *e, BMLoop *l);
void bmesh_radial_loop_remove(BMLoop *l, BMEdge *e);
-BMLoop *bmesh_radial_loop_next(BMLoop *l);
+/* note:
+ * bmesh_radial_loop_next(BMLoop *l) / prev.
+ * just use member access l->radial_next, l->radial_prev now */
+
int bmesh_radial_face_find(BMEdge *e, BMFace *f);
int bmesh_radial_facevert_count(BMLoop *l, BMVert *v);
BMLoop *bmesh_radial_faceloop_find_first(BMLoop *l, BMVert *v);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -274,8 +274,8 @@
while (1) {
l = BM_face_other_loop(e, f, v);
- if (bmesh_radial_loop_next(l) != l) {
- l = bmesh_radial_loop_next(l);
+ if (l != l->radial_next) {
+ l = l->radial_next;
f = l->f;
e = l->e;
if (walker->mask_face && !BMO_elem_flag_test(walker->bm, f, walker->mask_face)) {
@@ -479,7 +479,7 @@
if (!l)
break;
- l2 = bmesh_radial_loop_next(l);
+ l2 = l->radial_next;
if (l2 == l) {
break;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -53,7 +53,7 @@
for ( ; f2; f2 = BMW_step(®walker)) {
l2 = BM_iter_new(&liter2, bm, BM_LOOPS_OF_FACE, f2);
for ( ; l2; l2 = BM_iter_step(&liter2)) {
- l3 = bmesh_radial_loop_next(l2);
+ l3 = l2->radial_next;
if ( BMO_elem_flag_test(bm, l3->f, FACE_MARK) !=
BMO_elem_flag_test(bm, l2->f, FACE_MARK))
{
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-03-01 17:02:05 UTC (rev 44582)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-03-01 17:13:02 UTC (rev 44583)
@@ -559,7 +559,7 @@
/* find saved loop pointer */
l = se->l;
while (l->f != jf) {
- l = bmesh_radial_loop_next(l);
+ l = l->radial_next;
BLI_assert(l != se->l);
}
l = l->prev;
@@ -605,7 +605,7 @@
/* find saved loop pointer */
l = se->l;
while (l->f != jf) {
- l = bmesh_radial_loop_next(l);
+ l = l->radial_next;
BLI_assert(l != se->l);
}
}
More information about the Bf-blender-cvs
mailing list