From 74e1a33db4d399508170e4b898e87f1053fb55d1 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Tue, 30 Aug 2011 00:54:07 +0000 Subject: [PATCH] =bmesh= fixed bridge tool --- source/blender/bmesh/operators/connectops.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/source/blender/bmesh/operators/connectops.c b/source/blender/bmesh/operators/connectops.c index adc3b7c6fe4..4f7d1210735 100644 --- a/source/blender/bmesh/operators/connectops.c +++ b/source/blender/bmesh/operators/connectops.c @@ -159,8 +159,10 @@ void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op) break; } } - e2 = e3; - } while (e2 && e2 != e); + + if (e3) + e2 = e3; + } while (e3 && e2 != e); if (!e2) e2 = e; @@ -184,10 +186,11 @@ void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op) break; } } - e2 = e3; - } while (e2 && e2 != e); + if (e3) + e2 = e3; + } while (e3 && e2 != e); - if (v && !e2) { + if (v && !e3) { if (c==0) { if (BLI_array_count(vv1) && v == vv1[BLI_array_count(vv1)-1]) { printf("eck!\n"); @@ -197,7 +200,8 @@ void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op) BLI_array_append(vv2, v); } } - + + /*test for connected loops, and set cl1 or cl2 if so*/ if (v == ov) { if (c==0) cl1 = 1; @@ -248,7 +252,7 @@ void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op) lenv2--; } - for (i=0; i= BLI_array_count(ee2))