diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-24 14:53:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-24 14:54:21 +0300 |
| commit | 4737722968e09ec9e693bd80091623d486b7e357 (patch) | |
| tree | a957dd986eed5f1a4a0755daefd8e454eca7d29c /source/blender/bmesh/operators/bmo_join_triangles.c | |
| parent | 2da9a39418379ffd286a195188bcfba78eb4bf38 (diff) | |
Fix error joining tris -> quads
Incorrect flag check, would need to run multiple times.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_join_triangles.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 76856f6d1e0..5705b8e4811 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -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); |