Revision: 58957
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58957
Author: campbellbarton
Date: 2013-08-06 05:01:11 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Add key shortcut for context sensitive dissolve, Ctrl+X / Ctrl+Delete (as
with node editor)
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/mesh/mesh_ops.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-08-06
04:16:09 UTC (rev 58956)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-08-06
05:01:11 UTC (rev 58957)
@@ -3039,6 +3039,17 @@
/* -------------------------------------------------------------------- */
/* Dissolve */
+static void edbm_dissolve_prop__use_verts(wmOperatorType *ot)
+{
+ RNA_def_boolean(ot->srna, "use_verts", 0, "Dissolve Verts",
+ "Dissolve remaining vertices");
+}
+static void edbm_dissolve_prop__use_face_split(wmOperatorType *ot)
+{
+ RNA_def_boolean(ot->srna, "use_face_split", 0, "Face Split",
+ "Split off face corners to maintain surrounding
geometry");
+}
+
static int edbm_dissolve_verts_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
@@ -3068,8 +3079,7 @@
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- RNA_def_boolean(ot->srna, "use_face_split", 0, "Face Split",
- "Split off face corners to maintain surrounding
geometry");
+ edbm_dissolve_prop__use_face_split(ot);
}
static int edbm_dissolve_edges_exec(bContext *C, wmOperator *op)
@@ -3106,9 +3116,8 @@
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- RNA_def_boolean(ot->srna, "use_verts", 0, "Dissolve Verts", "Dissolve
remaining vertices");
- RNA_def_boolean(ot->srna, "use_face_split", 0, "Face Split",
- "Split off face corners to maintain surrounding
geometry");
+ edbm_dissolve_prop__use_verts(ot);
+ edbm_dissolve_prop__use_face_split(ot);
}
static int edbm_dissolve_faces_exec(bContext *C, wmOperator *op)
@@ -3140,10 +3149,44 @@
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- RNA_def_boolean(ot->srna, "use_verts", 0, "Dissolve Verts", "Dissolve
remaining vertices");
+ edbm_dissolve_prop__use_verts(ot);
}
+static int edbm_dissolve_mode_exec(bContext *C, wmOperator *op)
+{
+ Object *obedit = CTX_data_edit_object(C);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
+
+ if (em->selectmode & SCE_SELECT_VERTEX) {
+ return edbm_dissolve_verts_exec(C, op);
+ }
+ else if (em->selectmode & SCE_SELECT_EDGE) {
+ return edbm_dissolve_edges_exec(C, op);
+ }
+ else {
+ return edbm_dissolve_faces_exec(C, op);
+ }
+}
+
+void MESH_OT_dissolve_mode(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Dissolve Selection";
+ ot->description = "Dissolve geometry based on the selection mode";
+ ot->idname = "MESH_OT_dissolve_mode";
+
+ /* api callbacks */
+ ot->exec = edbm_dissolve_mode_exec;
+ ot->poll = ED_operator_editmesh;
+
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+ edbm_dissolve_prop__use_verts(ot);
+ edbm_dissolve_prop__use_face_split(ot);
+}
+
static int edbm_dissolve_limited_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
Modified: trunk/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_intern.h 2013-08-06
04:16:09 UTC (rev 58956)
+++ trunk/blender/source/blender/editors/mesh/mesh_intern.h 2013-08-06
05:01:11 UTC (rev 58957)
@@ -204,6 +204,7 @@
void MESH_OT_dissolve_verts(struct wmOperatorType *ot);
void MESH_OT_dissolve_edges(struct wmOperatorType *ot);
void MESH_OT_dissolve_faces(struct wmOperatorType *ot);
+void MESH_OT_dissolve_mode(struct wmOperatorType *ot);
void MESH_OT_dissolve_limited(struct wmOperatorType *ot);
void MESH_OT_delete_edgeloop(struct wmOperatorType *ot);
void MESH_OT_edge_face_add(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2013-08-06
04:16:09 UTC (rev 58956)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2013-08-06
05:01:11 UTC (rev 58957)
@@ -109,6 +109,7 @@
WM_operatortype_append(MESH_OT_dissolve_verts);
WM_operatortype_append(MESH_OT_dissolve_edges);
WM_operatortype_append(MESH_OT_dissolve_faces);
+ WM_operatortype_append(MESH_OT_dissolve_mode);
WM_operatortype_append(MESH_OT_dissolve_limited);
WM_operatortype_append(MESH_OT_delete_edgeloop);
WM_operatortype_append(MESH_OT_faces_shade_smooth);
@@ -384,6 +385,9 @@
WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_delete", XKEY,
KM_PRESS, 0, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_delete", DELKEY,
KM_PRESS, 0, 0);
+
+ WM_keymap_add_item(keymap, "MESH_OT_dissolve_mode", XKEY, KM_PRESS,
KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "MESH_OT_dissolve_mode", DELKEY, KM_PRESS,
KM_CTRL, 0);
kmi = WM_keymap_add_item(keymap, "MESH_OT_knife_tool", KKEY, KM_PRESS,
0, 0);
RNA_boolean_set(kmi->ptr, "use_occlude_geometry", true);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
