Revision: 58862
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58862
Author: campbellbarton
Date: 2013-08-03 15:30:57 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
code cleanup: replace bmesh_radial_face_find -> BM_edge_in_face
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-08-03
15:30:57 UTC (rev 58862)
@@ -1763,10 +1763,10 @@
/* validate that for each face, each vertex has another edge in its
disk cycle that is
* not e, and not shared. */
- if (bmesh_radial_face_find(l_f1->next->e, f2) ||
- bmesh_radial_face_find(l_f1->prev->e, f2) ||
- bmesh_radial_face_find(l_f2->next->e, f1) ||
- bmesh_radial_face_find(l_f2->prev->e, f1) )
+ if (BM_edge_in_face(l_f1->next->e, f2) ||
+ BM_edge_in_face(l_f1->prev->e, f2) ||
+ BM_edge_in_face(l_f2->next->e, f1) ||
+ BM_edge_in_face(l_f2->prev->e, f1) )
{
return NULL;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2013-08-03
15:30:57 UTC (rev 58862)
@@ -336,7 +336,7 @@
/**
* Returns whether or not a given edge is is part of a given face.
*/
-bool BM_edge_in_face(BMFace *f, BMEdge *e)
+bool BM_edge_in_face(BMEdge *e, BMFace *f)
{
if (e->l) {
BMLoop *l_iter, *l_first;
@@ -884,15 +884,15 @@
/**
* Counts the number of edges two faces share (if any)
*/
-int BM_face_share_edge_count(BMFace *f1, BMFace *f2)
+int BM_face_share_edge_count(BMFace *f_a, BMFace *f_b)
{
BMLoop *l_iter;
BMLoop *l_first;
int count = 0;
- l_iter = l_first = BM_FACE_FIRST_LOOP(f1);
+ l_iter = l_first = BM_FACE_FIRST_LOOP(f_a);
do {
- if (bmesh_radial_face_find(l_iter->e, f2)) {
+ if (BM_edge_in_face(l_iter->e, f_b)) {
count++;
}
} while ((l_iter = l_iter->next) != l_first);
@@ -910,7 +910,7 @@
l_iter = l_first = BM_FACE_FIRST_LOOP(f1);
do {
- if (bmesh_radial_face_find(l_iter->e, f2)) {
+ if (BM_edge_in_face(l_iter->e, f2)) {
return true;
}
} while ((l_iter = l_iter->next) != l_first);
@@ -930,7 +930,7 @@
l = e1->l;
do {
f = l->f;
- if (bmesh_radial_face_find(e2, f)) {
+ if (BM_edge_in_face(e2, f)) {
return true;
}
l = l->radial_next;
@@ -952,7 +952,7 @@
do {
f = l->f;
if (f->len == 4) {
- if (bmesh_radial_face_find(e2, f)) {
+ if (BM_edge_in_face(e2, f)) {
return true;
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.h 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.h 2013-08-03
15:30:57 UTC (rev 58862)
@@ -33,7 +33,7 @@
int BM_verts_in_face_count(BMFace *f, BMVert **varr, int len);
bool BM_verts_in_face(BMFace *f, BMVert **varr, int len);
-bool BM_edge_in_face(BMFace *f, BMEdge *e);
+bool BM_edge_in_face(BMEdge *e, BMFace *f);
bool BM_edge_in_loop(BMEdge *e, BMLoop *l);
bool BM_vert_in_edge(const BMEdge *e, const BMVert *v);
@@ -95,7 +95,7 @@
bool BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len);
bool BM_face_exists_multi_edge(BMEdge **earr, int len);
-int BM_face_share_face_count(BMFace *f1, BMFace *f2);
+int BM_face_share_face_count(BMFace *f_a, BMFace *f_b);
int BM_face_share_edge_count(BMFace *f1, BMFace *f2);
bool BM_face_share_face_check(BMFace *f1, BMFace *f2);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2013-08-03
15:30:57 UTC (rev 58862)
@@ -130,7 +130,6 @@
* Functions relating to this cycle:
* - #bmesh_radial_append
* - #bmesh_radial_loop_remove
- * - #bmesh_radial_face_find
* - #bmesh_radial_facevert_count
* - #bmesh_radial_faceloop_find_first
* - #bmesh_radial_faceloop_find_next
@@ -509,19 +508,6 @@
l->e = e;
}
-bool bmesh_radial_face_find(BMEdge *e, BMFace *f)
-{
- BMLoop *l_iter;
- int i, len;
-
- len = bmesh_radial_length(e->l);
- for (i = 0, l_iter = e->l; i < len; i++, l_iter = l_iter->radial_next) {
- if (l_iter->f == f)
- return true;
- }
- return false;
-}
-
/**
* \brief RADIAL COUNT FACE VERT
*
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.h 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.h 2013-08-03
15:30:57 UTC (rev 58862)
@@ -60,7 +60,6 @@
* bmesh_radial_loop_next(BMLoop *l) / prev.
* just use member access l->radial_next, l->radial_prev now */
-bool 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);
BMLoop *bmesh_radial_faceloop_find_next(BMLoop *l, BMVert *v);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
2013-08-03 15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
2013-08-03 15:30:57 UTC (rev 58862)
@@ -125,9 +125,9 @@
l = eed->l;
/* find correct order for v[1] */
- if (!(BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))) {
+ if (!(BM_edge_in_face(eed, l->f) && BM_edge_in_face(lasteed, l->f))) {
BM_ITER_ELEM (l, &liter, l, BM_LOOPS_OF_LOOP) {
- if (BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f,
lasteed))
+ if (BM_edge_in_face(eed, l->f) &&
BM_edge_in_face(lasteed, l->f))
break;
}
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-08-03
15:00:22 UTC (rev 58861)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-08-03
15:30:57 UTC (rev 58862)
@@ -1483,7 +1483,7 @@
{
BMFace *f = BKE_bmbvh_ray_cast(tree, co, dir, NULL, r_hitout, NULL);
- if (f && BM_edge_in_face(f, e))
+ if (f && BM_edge_in_face(e, f))
return NULL;
return f;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
