remove dissolve keybinding, conflicts with draw, add back to delete menu.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Mar 2012 07:44:20 +0000 (07:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Mar 2012 07:44:20 +0000 (07:44 +0000)
dissolve is now 'X -> D'

release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/mesh/mesh_ops.c

index d562f10f93540e14c54657e611e1d00fcdf4ccab..3fadfd1c45b1820c904f623b092b3065bdd766f5 100644 (file)
@@ -1818,8 +1818,8 @@ class VIEW3D_MT_edit_mesh_delete(Menu):
 
         layout.separator()
 
 
         layout.separator()
 
+        layout.operator("mesh.dissolve")
         layout.operator("mesh.edge_collapse")
         layout.operator("mesh.edge_collapse")
-        
         layout.operator("mesh.delete_edgeloop")
 
 
         layout.operator("mesh.delete_edgeloop")
 
 
index 0eaba0cd67b09bcbe6019efeeccce7ad070b4581..f44d287e9f3caf3d12409716af681aec0ebcd340 100644 (file)
@@ -341,8 +341,6 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
        kmi = WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", ACTIONMOUSE, KM_CLICK, KM_SHIFT | KM_CTRL, 0);
        RNA_boolean_set(kmi->ptr, "rotate_source", FALSE);
 
        kmi = WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", ACTIONMOUSE, KM_CLICK, KM_SHIFT | KM_CTRL, 0);
        RNA_boolean_set(kmi->ptr, "rotate_source", FALSE);
 
-       WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_dissolve", DKEY, KM_PRESS, 0, 0);
-
        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_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);