kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix error in recent check for duplicate tris

Browse Source
This commit is contained in:
Campbell Barton 2015-11-25 11:28:25 +11:00
parent e8b3a14dfb
commit 69cdddd4cf
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/bmesh/intern/bmesh_polygon.c
View File

@ -940,14 +940,10 @@ void BM_face_triangulate(
if (l_new->radial_next != l_new) { if (l_new->radial_next != l_new) {
BMLoop *l_iter = l_new->radial_next; BMLoop *l_iter = l_new->radial_next;
do { do {
if (UNLIKELY(l_new->prev->v == l_iter->prev->v)) { if (UNLIKELY((l_iter->f->len == 3) && (l_new->prev->v == l_iter->prev->v))) {
if (UNLIKELY(i == last_tri)) { /* Check the last tri because we swap last f_new with f at the end... */
/* Because we swap last f_new with f at the end... */ BLI_linklist_prepend(r_faces_double, (i != last_tri) ? f_new : f);
BLI_linklist_prepend(r_faces_double, f); break;
}
else {
BLI_linklist_prepend(r_faces_double, f_new);
}
} }
} while ((l_iter = l_iter->radial_next) != l_new); } while ((l_iter = l_iter->radial_next) != l_new);
} }