Commit: b6a49eb9498e5025bd7920f620bae1a44f34104e
Author: Campbell Barton
Date: Thu Dec 17 18:06:05 2015 +1100
Branches: master
https://developer.blender.org/rBb6a49eb9498e5025bd7920f620bae1a44f34104e
BMesh: add BM_face_share_vert_check/count
===================================================================
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/bmesh/intern/bmesh_queries.h
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_queries.c
b/source/blender/bmesh/intern/bmesh_queries.c
index e7a93c6..f8cc66f 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -1216,6 +1216,43 @@ bool BM_face_share_edge_check(BMFace *f1, BMFace *f2)
}
/**
+ * Counts the number of verts two faces share (if any).
+ */
+int BM_face_share_vert_count(BMFace *f_a, BMFace *f_b)
+{
+ BMLoop *l_iter;
+ BMLoop *l_first;
+ int count = 0;
+
+ l_iter = l_first = BM_FACE_FIRST_LOOP(f_a);
+ do {
+ if (BM_vert_in_face(l_iter->v, f_b)) {
+ count++;
+ }
+ } while ((l_iter = l_iter->next) != l_first);
+
+ return count;
+}
+
+/**
+ * Returns true if the faces share a vert.
+ */
+bool BM_face_share_vert_check(BMFace *f_a, BMFace *f_b)
+{
+ BMLoop *l_iter;
+ BMLoop *l_first;
+
+ l_iter = l_first = BM_FACE_FIRST_LOOP(f_a);
+ do {
+ if (BM_vert_in_face(l_iter->v, f_b)) {
+ return true;
+ }
+ } while ((l_iter = l_iter->next) != l_first);
+
+ return false;
+}
+
+/**
* Test if e1 shares any faces with e2
*/
bool BM_edge_share_face_check(BMEdge *e1, BMEdge *e2)
diff --git a/source/blender/bmesh/intern/bmesh_queries.h
b/source/blender/bmesh/intern/bmesh_queries.h
index cfe2917..257743b 100644
--- a/source/blender/bmesh/intern/bmesh_queries.h
+++ b/source/blender/bmesh/intern/bmesh_queries.h
@@ -143,10 +143,14 @@ bool BM_face_exists_overlap(BMVert **varr, const int
len, BMFace **r_f_overla
bool BM_face_exists_overlap_subset(BMVert **varr, const int len)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
int BM_face_share_face_count(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-int BM_face_share_edge_count(BMFace *f1, BMFace *f2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+int BM_face_share_edge_count(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+int BM_face_share_vert_count(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+
+bool BM_face_share_face_check(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+bool BM_face_share_edge_check(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+bool BM_face_share_vert_check(BMFace *f_a, BMFace *f_b)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+
-bool BM_face_share_face_check(BMFace *f1, BMFace *f2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-bool BM_face_share_edge_check(BMFace *f1, BMFace *f2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
bool BM_edge_share_face_check(BMEdge *e1, BMEdge *e2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
bool BM_edge_share_quad_check(BMEdge *e1, BMEdge *e2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
bool BM_edge_share_vert_check(BMEdge *e1, BMEdge *e2)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
