griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

overlapping faces made join-triangles fail, check for this case and silently ignore them.

Browse Source
This commit is contained in:
Campbell Barton
2013-10-03 10:29:53 +00:00
parent 253e9fb041
commit 6d1dba7c37
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/operators/bmo_join_triangles.c
View File

@@ -326,7 +326,11 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
(BMO_elem_flag_test(bm, l_a->next->e, EDGE_MARK) == false) &&
(BMO_elem_flag_test(bm, l_a->prev->e, EDGE_MARK) == false) &&
(BMO_elem_flag_test(bm, l_b->next->e, EDGE_MARK) == false) &&
(BMO_elem_flag_test(bm, l_b->prev->e, EDGE_MARK) == false))
(BMO_elem_flag_test(bm, l_b->prev->e, EDGE_MARK) == false) &&
/* check for faces that use same verts, this is supported but raises an error
* and cancels the operation when performed from editmode, since this is only
* two triangles we only need to compare a single vertex */
(LIKELY(l_a->prev->v != l_b->prev->v)))
{
BMFace *f_new;
f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);