From 6664d1bf594a44b41236a42111d64c54ff3b1eb6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 14 Jun 2013 04:04:35 +0000 Subject: remove 'dissolve_edge_loop' bmesh operator, edgeloop dissolve replaces this now. --- source/blender/bmesh/operators/bmo_dissolve.c | 58 --------------------------- 1 file changed, 58 deletions(-) (limited to 'source/blender/bmesh/operators/bmo_dissolve.c') diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index cca88a9eb47..e4f2423ca17 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -228,64 +228,6 @@ cleanup: BLI_array_free(regions); } -/* almost identical to dissolve edge, except it cleans up vertice */ -void bmo_dissolve_edgeloop_exec(BMesh *bm, BMOperator *op) -{ - /* BMOperator fop; */ - BMFace *act_face = bm->act_face; - BMOIter oiter; - BMIter iter; - BMVert *v, **verts = NULL; - BLI_array_declare(verts); - BMEdge *e; - int i; - - - BMO_ITER (e, &oiter, op->slots_in, "edges", BM_EDGE) { - BMFace *fa, *fb; - - if (BM_edge_face_pair(e, &fa, &fb)) { - BMFace *f_new; - BMO_elem_flag_enable(bm, e->v1, VERT_MARK); - BMO_elem_flag_enable(bm, e->v2, VERT_MARK); - - /* BMESH_TODO - check on delaying edge removal since we may end up removing more than - * one edge, and later reference a removed edge */ - f_new = BM_faces_join_pair(bm, fa, fb, e, true); - - if (f_new) { - /* maintain active face */ - if (act_face && bm->act_face == NULL) { - bm->act_face = f_new; - } - } - } - } - - BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { - if (BMO_elem_flag_test(bm, v, VERT_MARK) && BM_vert_edge_count(v) == 2) { - BLI_array_append(verts, v); - } - } - - /* clean up extreneous 2-valence vertice */ - for (i = 0; i < BLI_array_count(verts); i++) { - if (verts[i]->e) { - BM_vert_collapse_edge(bm, verts[i]->e, verts[i], true); - } - } - - BLI_array_free(verts); - - //BMO_op_initf(bm, &fop, "dissolve_faces faces=%ff", FACE_MARK); - //BMO_op_exec(bm, &fop); - - //BMO_slot_copy(op, &fop, "region.out", "region.out"); - - //BMO_op_finish(bm, &fop); -} - - void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) { /* might want to make this an option or mode - campbell */ -- cgit v1.2.3