Commit: 69cdddd4cf3ebe5987477399effabff892233608
Author: Campbell Barton
Date: Wed Nov 25 11:28:25 2015 +1100
Branches: master
https://developer.blender.org/rB69cdddd4cf3ebe5987477399effabff892233608
Fix error in recent check for duplicate tris
===================================================================
M source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c
b/source/blender/bmesh/intern/bmesh_polygon.c
index 1b1b133..af0331d 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -940,14 +940,10 @@ void BM_face_triangulate(
if (l_new->radial_next != l_new) {
BMLoop *l_iter = l_new->radial_next;
do {
- if (UNLIKELY(l_new->prev->v ==
l_iter->prev->v)) {
- if (UNLIKELY(i == last_tri)) {
- /* Because we swap last
f_new with f at the end... */
-
BLI_linklist_prepend(r_faces_double, f);
- }
- else {
-
BLI_linklist_prepend(r_faces_double, f_new);
- }
+ if (UNLIKELY((l_iter->f->len == 3) &&
(l_new->prev->v == l_iter->prev->v))) {
+ /* Check the last tri because
we swap last f_new with f at the end... */
+
BLI_linklist_prepend(r_faces_double, (i != last_tri) ? f_new : f);
+ break;
}
} while ((l_iter = l_iter->radial_next) !=
l_new);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
