[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39784] branches/bmesh/blender/source/ blender/bmesh/operators/connectops.c: =bmesh= fixed bridge tool

[Joseph Eagar]

Revision: 39784
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39784
Author:   joeedh
Date:     2011-08-30 00:54:07 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
=bmesh= fixed bridge tool

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/connectops.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c	2011-08-30 00:29:12 UTC (rev 39783)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c	2011-08-30 00:54:07 UTC (rev 39784)
@@ -159,8 +159,10 @@
 						break;
 					}
 				}
-				e2 = e3;
-			} while (e2 && e2 != e);
+				
+				if (e3)
+					e2 = e3;
+			} while (e3 && e2 != e);
 			
 			if (!e2)
 				e2 = e;
@@ -184,10 +186,11 @@
 						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 @@
 					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 @@
 			lenv2--;
 		}
 		
-		for (i=0; i<BLI_array_count(ee1); i++) {
+		for (i=0; i<BLI_array_count(ee1) && lenv1; i++) {
 			BMFace *f;
 		
 			if (j >= BLI_array_count(ee2))