blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix error joining tris -> quads 

Incorrect flag check, would need to run multiple times.
This commit is contained in:
Campbell Barton 2015-05-24 21:53:24 +10:00
parent 2da9a39418
commit 4737722968
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
f_b = e->l->radial_next->f;
/* check if another edge already claimed this face */
if ((BMO_elem_flag_test(bm, f_a, FACE_MARK) == false) ||
if ((BMO_elem_flag_test(bm, f_a, FACE_MARK) == false) &&
(BMO_elem_flag_test(bm, f_b, FACE_MARK) == false))
{
BMO_elem_flag_enable(bm, f_a, FACE_MARK);