diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-03-09 18:15:17 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-03-09 18:15:17 +0300 |
| commit | a254db099d3a8a79553c0d7b83ba1f5bddbbf26d (patch) | |
| tree | b9c44988721b1fa7c059ff545b6df409d4c8c0f3 /source/blender/editors/mesh/editmesh_tools.c | |
| parent | 15979466dcd018c88395c3a12b85353e6d9061ee (diff) | |
fixed some dissolveverts/faces bugs and added a few hackish fixes for some others, so they don't crash
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index bd4cd1ae705..5e759f912c6 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1111,7 +1111,7 @@ static EnumPropertyItem prop_mesh_delete_types[] = { {4, "EDGE_FACE","Edges & Faces", ""}, {5, "ONLY_FACE","Only Faces", ""}, {6, "EDGE_LOOP","Edge Loop", ""}, - {7, "COLLAPSE","Collapse", ""}, + {7, "DISSOLVE","Dissolve Verts", ""}, {0, NULL, NULL, NULL} }; @@ -6921,7 +6921,9 @@ static int convert_quads_to_tris_exec(bContext *C, wmOperator *op) Object *obedit= CTX_data_edit_object(C); EditMesh *em= ((Mesh *)obedit->data)->edit_mesh; - convert_to_triface(em,0); + //convert_to_triface(em,0); + if (!EDBM_CallOpf(em, op, "triangulate faces=%hf", BM_SELECT)) + return OPERATOR_CANCELLED; WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); |