[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36309] branches/bmesh/blender/source/ blender/editors/mesh/bmesh_tools.c: =bmesh= request from Danial Salazaar, added merge->collapse to delete menu
Joseph Eagar
joeedh at gmail.com
Sun Apr 24 09:49:21 CEST 2011
Revision: 36309
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36309
Author: joeedh
Date: 2011-04-24 07:49:21 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
=bmesh= request from Danial Salazaar, added merge->collapse to delete menu
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-04-24 07:45:24 UTC (rev 36308)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-04-24 07:49:21 UTC (rev 36309)
@@ -1007,6 +1007,7 @@
/* Note, these values must match delete_mesh() event values */
static EnumPropertyItem prop_mesh_delete_types[] = {
{7, "DISSOLVE", 0, "Dissolve", ""},
+ {12, "COLLAPSE", 0, "Collapse", ""},
{10,"VERT", 0, "Vertices", ""},
{1, "EDGE", 0, "Edges", ""},
{2, "FACE", 0, "Faces", ""},
@@ -1019,10 +1020,18 @@
static int delete_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
+ BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh;
Scene *scene = CTX_data_scene(C);
-
- delete_mesh(C, obedit, op, RNA_enum_get(op->ptr, "type"), scene);
+ int type = RNA_enum_get(op->ptr, "type");
+ if (type != 12) {
+ delete_mesh(C, obedit, op, type, scene);
+ } else {
+ if (!EDBM_CallOpf(em, op, "collapse edges=%he", BM_SELECT))
+ return OPERATOR_CANCELLED;
+ }
+
+
WM_event_add_notifier(C, NC_GEOM|ND_DATA|ND_SELECT, obedit);
return OPERATOR_FINISHED;
More information about the Bf-blender-cvs
mailing list