diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-12 19:24:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-12 19:24:02 +0400 |
| commit | 6c28e1d76ad78fb3baa567f8543fa2462983a70e (patch) | |
| tree | a6e5c8e60b90ab6c0213ceca5795927ace7f5c61 /source/blender | |
| parent | 97d2439077339ac0e7c55a1b904591e561fef167 (diff) | |
fix for crash with new bridge method used with invalid edge-loops.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_edgeloop.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index d85db111a23..60ed3a49378 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -150,14 +150,14 @@ int BM_mesh_edgeloops_find(BMesh *bm, ListBase *r_eloops, /* 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); } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 227eb29453e..65e31b2093b 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3795,8 +3795,8 @@ void MESH_OT_bridge_edge_loops(wmOperatorType *ot) }; /* 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 */ |