archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- remove edge collapse loop operator (now replaced by dissolve).

Browse Source 
- fix missing null pointer check from own recent changes.
- add asserts if BLI path functions are given wrong id's
This commit is contained in:
Campbell Barton
2013-06-27 01:10:19 +00:00
parent 46808dd22c
commit bb42703ea3
5 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -407,34 +407,6 @@ void MESH_OT_edge_collapse(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
static int edbm_collapse_edge_loop_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BKE_editmesh_from_object(obedit);
if (!EDBM_op_callf(em, op, "dissolve_edge_loop edges=%he", BM_ELEM_SELECT))
return OPERATOR_CANCELLED;
EDBM_update_generic(em, true, true);
return OPERATOR_FINISHED;
}
void MESH_OT_edge_collapse_loop(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Edge Collapse Loop";
ot->description = "Collapse selected edge loops";
ot->idname = "MESH_OT_edge_collapse_loop";
/* api callbacks */
ot->exec = edbm_collapse_edge_loop_exec;
ot->poll = ED_operator_editmesh;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
static int edbm_add_edge_face__smooth_get(BMesh *bm)
{
BMEdge *e;