[Bf-blender-cvs] [4737722] master: Fix error joining tris -> quads

[Campbell Barton]

Commit: 4737722968e09ec9e693bd80091623d486b7e357
Author: Campbell Barton
Date:   Sun May 24 21:53:24 2015 +1000
Branches: master
https://developer.blender.org/rB4737722968e09ec9e693bd80091623d486b7e357

Fix error joining tris -> quads

Incorrect flag check, would need to run multiple times.

===================================================================

M	source/blender/bmesh/operators/bmo_join_triangles.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index 76856f6..5705b8e 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);