[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56712] trunk/blender/source/blender: fix for crash with new bridge method used with invalid edge-loops.

[Campbell Barton]

Revision: 56712
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56712
Author:   campbellbarton
Date:     2013-05-12 15:24:02 +0000 (Sun, 12 May 2013)
Log Message:
-----------
fix for crash with new bridge method used with invalid edge-loops.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c	2013-05-12 14:45:15 UTC (rev 56711)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c	2013-05-12 15:24:02 UTC (rev 56712)
@@ -150,14 +150,14 @@
 
 			/* add both directions */
 			if (bm_loop_build(el_store, e->v1, e->v2,  1) &&
-			    bm_loop_build(el_store, e->v2, e->v1, -1))
+			    bm_loop_build(el_store, e->v2, e->v1, -1) &&
+			    el_store->verts.first)
 			{
 				BLI_addtail(r_eloops, el_store);
 				BM_elem_flag_disable(e, BM_ELEM_INTERNAL_TAG);
 				count++;
 			}
 			else {
-				BLI_remlink(r_eloops, el_store);
 				BM_edgeloop_free(el_store);
 			}
 		}

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-05-12 14:45:15 UTC (rev 56711)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-05-12 15:24:02 UTC (rev 56712)
@@ -3795,8 +3795,8 @@
 	};
 
 	/* identifiers */
-	ot->name = "Bridge Two Edge Loops";
-	ot->description = "Make faces between two edge loops";
+	ot->name = "Bridge Edge Loops";
+	ot->description = "Make faces between two or more edge loops";
 	ot->idname = "MESH_OT_bridge_edge_loops";
 	
 	/* api callbacks */