[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58827] trunk/blender/source/blender/bmesh /operators/bmo_join_triangles.c: correct error in own recent edits to triangle joining

[Campbell Barton]

Revision: 58827
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58827
Author:   campbellbarton
Date:     2013-08-02 13:35:04 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
correct error in own recent edits to triangle joining

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c   
2013-08-02 13:21:32 UTC (rev 58826)
+++ trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c   
2013-08-02 13:35:04 UTC (rev 58827)
@@ -220,14 +220,15 @@
 
        /* flag all edges of all input face */
        BMO_ITER (f, &siter, op->slots_in, "faces", BM_FACE) {
-               BMO_elem_flag_enable(bm, f, FACE_INPUT);
+               if (f->len == 3) {
+                       BMO_elem_flag_enable(bm, f, FACE_INPUT);
+               }
        }
 
        /* flag edges surrounded by 2 flagged triangles */
        BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
                BMFace *f_a, *f_b;
                if (BM_edge_face_pair(e, &f_a, &f_b) &&
-                   (f_a->len == 3 && f_b->len == 3) &&
                    (BMO_elem_flag_test(bm, f_a, FACE_INPUT) && 
BMO_elem_flag_test(bm, f_b, FACE_INPUT)))
                {
                        BMO_elem_flag_enable(bm, e, EDGE_MARK);
@@ -307,9 +308,11 @@
                        continue;
 
                BM_edge_face_pair(e, &f_a, &f_b); /* checked above */
-               f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
-               if (f_new) {
-                       BMO_elem_flag_enable(bm, f_new, FACE_OUT);
+               if ((f_a->len == 3 && f_b->len == 3)) {
+                       f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
+                       if (f_new) {
+                               BMO_elem_flag_enable(bm, f_new, FACE_OUT);
+                       }
                }
        }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs