[Bf-blender-cvs] [01ec664] master: BMesh: remove redundant connect-nonplanar loop

[Campbell Barton]

Commit: 01ec66423cab11a02fa0a1392b4d713c833680ee
Author: Campbell Barton
Date:   Sun Feb 1 19:18:39 2015 +1100
Branches: master
https://developer.blender.org/rB01ec66423cab11a02fa0a1392b4d713c833680ee

BMesh: remove redundant connect-nonplanar loop

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

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

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

diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c 
b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
index 6859ce2..c9ce2c5 100644
--- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c
+++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
@@ -153,23 +153,11 @@ void bmo_connect_verts_nonplanar_exec(BMesh *bm, 
BMOperator *op)
 {
        BMOIter siter;
        BMFace *f;
-       int totface = 0, totloop = 0;
+       bool changed = false;
        BLI_LINKSTACK_DECLARE(fstack, BMFace *);
 
        const float angle_limit = BMO_slot_float_get(op->slots_in, 
"angle_limit");
 
-
-       BMO_ITER (f, &siter, op->slots_in, "faces", BM_FACE) {
-               if (f->len > 3) {
-                       totface += 1;
-                       totloop += f->len;
-               }
-       }
-
-       if (totface == 0) {
-               return;
-       }
-
        BLI_LINKSTACK_INIT(fstack);
 
        BMO_ITER (f, &siter, op->slots_in, "faces", BM_FACE) {
@@ -188,11 +176,14 @@ void bmo_connect_verts_nonplanar_exec(BMesh *bm, 
BMOperator *op)
                                        BLI_LINKSTACK_PUSH(fstack, f_pair[j]);
                                }
                        }
+                       changed = true;
                }
        }
 
        BLI_LINKSTACK_FREE(fstack);
 
-       BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "edges.out", 
BM_EDGE, EDGE_OUT);
-       BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out", 
BM_FACE, FACE_OUT);
+       if (changed) {
+               BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, 
"edges.out", BM_EDGE, EDGE_OUT);
+               BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, 
"faces.out", BM_FACE, FACE_OUT);
+       }
 }

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