svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
[blender.git] / source / blender / editors / mesh / mesh_ops.c
index 1128a2c93b43827e5fa6eb1504473fc754b786c9..edb131d7da2e9f556a5462b098c8fda0dc3a420a 100644 (file)
@@ -45,6 +45,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_mesh.h"
 #include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_screen.h"
 #include "ED_mesh.h"
+#include "ED_screen.h"
+#include "ED_transform.h"
 #include "ED_view3d.h"
 
-#include "BIF_transform.h"
+#include "UI_interface.h"
 
 #include "mesh_intern.h"
 
+/******************************** menus *************************************/
 
-static int mesh_add_duplicate_exec(bContext *C, wmOperator *op)
+static int vertex_specials_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       Object *ob= CTX_data_edit_object(C);
-       EditMesh *em= ((Mesh *)ob->data)->edit_mesh;
+       uiPopupMenu *pup;
+       uiLayout *layout;
+
+       pup= uiPupMenuBegin(C, "Vertex Specials", 0);
+       layout= uiPupMenuLayout(pup);
+       uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_REGION_WIN);
+
+       uiItemO(layout, "Remove Doubles", 0, "MESH_OT_remove_doubles");
+       uiItemO(layout, "Merge...", 0, "MESH_OT_merge");
+       uiItemO(layout, "Smooth", 0, "MESH_OT_vertices_smooth");
+       uiItemO(layout, "Select Vertex Path", 0, "MESH_OT_select_vertex_path"); 
+       //uiItemO(layout, "Blend From Shape", 0, "MESH_OT_blend_from_shape");
+       //uiItemO(layout, "Propagate to All Shapes", 0, "MESH_OT_shape_propagate_to_all");
 
-       adduplicateflag(em, SELECT);
+       uiPupMenuEnd(C, pup);
        
-       return OPERATOR_FINISHED;
+       return OPERATOR_CANCELLED;
 }
 
-static int mesh_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static void MESH_OT_vertex_specials(wmOperatorType *ot)
 {
-       WM_cursor_wait(1);
-       mesh_add_duplicate_exec(C, op);
-       WM_cursor_wait(0);
+       /* identifiers */
+       ot->name= "Vertex Specials";
+       ot->idname= "MESH_OT_vertex_specials";
        
-       RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
-       WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
+       /* api callbacks */
+       ot->invoke= vertex_specials_invoke;
+       ot->poll= ED_operator_editmesh;
+}
+
+static int edge_specials_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       uiPopupMenu *pup;
+       uiLayout *layout;
+
+       pup= uiPupMenuBegin(C, "Edge Specials", 0);
+       layout= uiPupMenuLayout(pup);
+       uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_REGION_WIN);
+
+       uiItemO(layout, "Mark Seam", 0, "MESH_OT_mark_seam");
+       uiItemBooleanO(layout, "Clear Seam", 0, "MESH_OT_mark_seam", "clear", 1);
+       uiItemEnumO(layout, "Rotate Edge CW", 0, "MESH_OT_edge_rotate", "direction", 1);
+       uiItemEnumO(layout, "Rotate Edge CCW", 0, "MESH_OT_edge_rotate", "direction", 2);
+       //uiItemO(layout, "Loopcut", 0, "MESH_OT_loop_cut"); // CutEdgeloop(em, 1);
+       //uiItemO(layout, "Edge Slide", 0, "MESH_OT_edge_slide"); // EdgeSlide(em, 0,0.0);
+       uiItemO(layout, "Edge Loop", 0, "MESH_OT_loop_multi_select");
+       uiItemBooleanO(layout, "Edge Ring", 0, "MESH_OT_loop_multi_select", "ring", 1);
+       uiItemO(layout, NULL, 0, "MESH_OT_loop_to_region");
+       uiItemO(layout, NULL, 0, "MESH_OT_region_to_loop");
+       uiItemO(layout, "Mark Sharp", 0, "MESH_OT_mark_sharp");
+       uiItemBooleanO(layout, "Clear Sharp", 0, "MESH_OT_mark_sharp", "clear", 1);
+
+       uiPupMenuEnd(C, pup);
+
+       return OPERATOR_CANCELLED;
+}
+
+static void MESH_OT_edge_specials(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Edge Specials";
+       ot->idname= "MESH_OT_edge_specials";
        
-       return OPERATOR_FINISHED;
+       /* api callbacks */
+       ot->invoke= edge_specials_invoke;
+       ot->poll= ED_operator_editmesh;
 }
 
-static void MESH_OT_add_duplicate(wmOperatorType *ot)
+static int face_specials_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
+       uiPopupMenu *pup;
+       uiLayout *layout;
+
+       pup= uiPupMenuBegin(C, "Face Specials", 0);
+       layout= uiPupMenuLayout(pup);
+       uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_REGION_WIN);
+
+       uiItemO(layout, NULL, 0, "MESH_OT_flip_normals");
+       // uiItemO(layout, "Bevel", 0, "MESH_OT_bevel"); // bevelmenu(em)
+       uiItemO(layout, NULL, 0, "MESH_OT_faces_shade_smooth");
+       uiItemO(layout, NULL, 0, "MESH_OT_faces_shade_flat");
+       uiItemO(layout, NULL, 0, "MESH_OT_quads_convert_to_tris");
+       uiItemO(layout, NULL, 0, "MESH_OT_tris_convert_to_quads");
+       uiItemO(layout, NULL, 0, "MESH_OT_edge_flip");
+
+       uiItemS(layout);
+
+       uiItemO(layout, NULL, 0, "MESH_OT_fill");
+       uiItemO(layout, NULL, 0, "MESH_OT_beauty_fill");
+
+       uiItemS(layout);
+
+       // uiItemO(layout, NULL, 0, "MESH_OT_face_mode"); // mesh_set_face_flags(em, 1);
+       // uiItemBooleanO(layout, NULL, 0, "MESH_OT_face_mode", "clear", 1); // mesh_set_face_flags(em, 0);
+       //
+       // uiItemS(layout);
+
+       uiItemMenuEnumO(layout, NULL, 0, "MESH_OT_uvs_rotate", "direction");
+       uiItemMenuEnumO(layout, NULL, 0, "MESH_OT_uvs_mirror", "axis");
+       uiItemMenuEnumO(layout, NULL, 0, "MESH_OT_colors_rotate", "direction");
+       uiItemMenuEnumO(layout, NULL, 0, "MESH_OT_colors_mirror", "axis");
+
+       uiPupMenuEnd(C, pup);
        
+       return OPERATOR_CANCELLED;
+}
+
+static void MESH_OT_face_specials(wmOperatorType *ot)
+{
        /* identifiers */
-       ot->name= "Add Duplicate";
-       ot->idname= "MESH_OT_add_duplicate";
+       ot->name= "Face Specials";
+       ot->idname= "MESH_OT_face_specials";
        
        /* api callbacks */
-       ot->invoke= mesh_add_duplicate_invoke;
-       ot->exec= mesh_add_duplicate_exec;
-       
+       ot->invoke= face_specials_invoke;
        ot->poll= ED_operator_editmesh;
+}
+
+static int specials_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       uiPopupMenu *pup;
+       uiLayout *layout;
+
+       pup= uiPupMenuBegin(C, "Specials", 0);
+       layout= uiPupMenuLayout(pup);
+       uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_REGION_WIN);
+
+       uiItemO(layout, "Subdivide", 0, "MESH_OT_subdivide");
+       uiItemFloatO(layout, "Subdivide Smooth", 0, "MESH_OT_subdivide", "smoothness", 1.0f);
+       uiItemO(layout, "Merge...", 0, "MESH_OT_merge");
+       uiItemO(layout, "Remove Doubles", 0, "MESH_OT_remove_doubles");
+       uiItemO(layout, "Hide", 0, "MESH_OT_hide");
+       uiItemO(layout, "Reveal", 0, "MESH_OT_reveal");
+       uiItemO(layout, "Select Inverse", 0, "MESH_OT_select_inverse");
+       uiItemO(layout, NULL, 0, "MESH_OT_flip_normals");
+       uiItemO(layout, "Smooth", 0, "MESH_OT_vertices_smooth");
+       // uiItemO(layout, "Bevel", 0, "MESH_OT_bevel"); // bevelmenu(em)
+       uiItemO(layout, NULL, 0, "MESH_OT_faces_shade_smooth");
+       uiItemO(layout, NULL, 0, "MESH_OT_faces_shade_flat");
+       //uiItemO(layout, "Blend From Shape", 0, "MESH_OT_blend_from_shape");
+       //uiItemO(layout, "Propagate to All Shapes", 0, "MESH_OT_shape_propagate_to_all");
+       uiItemO(layout, "Select Vertex Path", 0, "MESH_OT_select_vertex_path"); 
+       
+       uiPupMenuEnd(C, pup);
        
-       /* to give to transform */
-       RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+       return OPERATOR_CANCELLED;
 }
 
+static void MESH_OT_specials(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Specials";
+       ot->idname= "MESH_OT_specials";
+       
+       /* api callbacks */
+       ot->invoke= specials_invoke;
+       ot->poll= ED_operator_editmesh;
+}
 
-/* ************************** registration **********************************/
+/**************************** registration **********************************/
 
 void ED_operatortypes_mesh(void)
 {
-       WM_operatortype_append(MESH_OT_de_select_all);
+       wmOperatorType *ot;
+       
+       WM_operatortype_append(MESH_OT_select_all_toggle);
        WM_operatortype_append(MESH_OT_select_more);
        WM_operatortype_append(MESH_OT_select_less);
-       WM_operatortype_append(MESH_OT_selectswap_mesh);
+       WM_operatortype_append(MESH_OT_select_inverse);
        WM_operatortype_append(MESH_OT_select_non_manifold);
-       WM_operatortype_append(MESH_OT_selectconnected_mesh_all);
-       WM_operatortype_append(MESH_OT_selectconnected_mesh);
-       WM_operatortype_append(MESH_OT_hide_mesh);
-       WM_operatortype_append(MESH_OT_reveal_mesh);
-       WM_operatortype_append(MESH_OT_righthandfaces);
+       WM_operatortype_append(MESH_OT_select_linked);
+       WM_operatortype_append(MESH_OT_select_linked_pick);
+       WM_operatortype_append(MESH_OT_select_random);
+       WM_operatortype_append(MESH_OT_selection_type);
+       WM_operatortype_append(MESH_OT_hide);
+       WM_operatortype_append(MESH_OT_reveal);
+       WM_operatortype_append(MESH_OT_select_by_number_vertices);
+       WM_operatortype_append(MESH_OT_normals_make_consistent);
+       WM_operatortype_append(MESH_OT_merge);
        WM_operatortype_append(MESH_OT_subdivide);
-       WM_operatortype_append(MESH_OT_subdivide_multi);
-       WM_operatortype_append(MESH_OT_subdivide_multi_fractal);
-       WM_operatortype_append(MESH_OT_subdivide_smooth);
-       WM_operatortype_append(MESH_OT_subdivs);
-       WM_operatortype_append(MESH_OT_select_linked_flat_faces);
-       WM_operatortype_append(MESH_OT_select_sharp_edges);
-       WM_operatortype_append(MESH_OT_add_primitive_plane);
-       WM_operatortype_append(MESH_OT_add_primitive_cube);
-       WM_operatortype_append(MESH_OT_add_primitive_circle);
-       WM_operatortype_append(MESH_OT_add_primitive_cylinder);
-       WM_operatortype_append(MESH_OT_add_primitive_tube);
-       WM_operatortype_append(MESH_OT_add_primitive_cone);
-       WM_operatortype_append(MESH_OT_add_primitive_grid);
-       WM_operatortype_append(MESH_OT_add_primitive_monkey);
-       WM_operatortype_append(MESH_OT_add_primitive_uv_sphere);
-       WM_operatortype_append(MESH_OT_add_primitive_ico_sphere);
-       WM_operatortype_append(MESH_OT_clear_fgon);
-       WM_operatortype_append(MESH_OT_make_fgon);
-       WM_operatortype_append(MESH_OT_add_duplicate);
-       WM_operatortype_append(MESH_OT_removedoublesflag);
-       WM_operatortype_append(MESH_OT_extrude_mesh);
-       WM_operatortype_append(MESH_OT_edit_faces);
-
-       WM_operatortype_append(MESH_OT_delete_mesh);
+       WM_operatortype_append(MESH_OT_faces_select_linked_flat);
+       WM_operatortype_append(MESH_OT_edges_select_sharp);
+       WM_operatortype_append(MESH_OT_primitive_plane_add);
+       WM_operatortype_append(MESH_OT_primitive_cube_add);
+       WM_operatortype_append(MESH_OT_primitive_circle_add);
+       WM_operatortype_append(MESH_OT_primitive_cylinder_add);
+       WM_operatortype_append(MESH_OT_primitive_tube_add);
+       WM_operatortype_append(MESH_OT_primitive_cone_add);
+       WM_operatortype_append(MESH_OT_primitive_grid_add);
+       WM_operatortype_append(MESH_OT_primitive_monkey_add);
+       WM_operatortype_append(MESH_OT_primitive_uv_sphere_add);
+       WM_operatortype_append(MESH_OT_primitive_ico_sphere_add);
+       WM_operatortype_append(MESH_OT_fgon_clear);
+       WM_operatortype_append(MESH_OT_fgon_make);
+       WM_operatortype_append(MESH_OT_duplicate);
+       WM_operatortype_append(MESH_OT_remove_doubles);
+       WM_operatortype_append(MESH_OT_extrude);
+       WM_operatortype_append(MESH_OT_spin);
+       WM_operatortype_append(MESH_OT_screw);
+       
+       WM_operatortype_append(MESH_OT_vertices_transform_to_sphere);
+       WM_operatortype_append(MESH_OT_split);
+       WM_operatortype_append(MESH_OT_extrude_repeat);
+       WM_operatortype_append(MESH_OT_edge_rotate);
+       WM_operatortype_append(MESH_OT_select_vertex_path);
+       WM_operatortype_append(MESH_OT_loop_to_region);
+       WM_operatortype_append(MESH_OT_region_to_loop);
+       
+       WM_operatortype_append(MESH_OT_uvs_rotate);
+       WM_operatortype_append(MESH_OT_uvs_mirror);
+       WM_operatortype_append(MESH_OT_colors_rotate);
+       WM_operatortype_append(MESH_OT_colors_mirror);
+       
+       WM_operatortype_append(MESH_OT_fill);
+       WM_operatortype_append(MESH_OT_beauty_fill);
+       WM_operatortype_append(MESH_OT_quads_convert_to_tris);
+       WM_operatortype_append(MESH_OT_tris_convert_to_quads);
+       WM_operatortype_append(MESH_OT_edge_flip);
+       WM_operatortype_append(MESH_OT_faces_shade_smooth);
+       WM_operatortype_append(MESH_OT_faces_shade_flat);
+
+       WM_operatortype_append(MESH_OT_delete);
 
        WM_operatortype_append(MESH_OT_separate);
        WM_operatortype_append(MESH_OT_dupli_extrude_cursor);
        WM_operatortype_append(MESH_OT_loop_select);
-       WM_operatortype_append(MESH_OT_add_edge_face);
+       WM_operatortype_append(MESH_OT_edge_face_add);
+       WM_operatortype_append(MESH_OT_select_shortest_path);
+       WM_operatortype_append(MESH_OT_select_similar);
+       WM_operatortype_append(MESH_OT_loop_multi_select);
+       WM_operatortype_append(MESH_OT_mark_seam);
+       WM_operatortype_append(MESH_OT_mark_sharp);
+       WM_operatortype_append(MESH_OT_vertices_smooth);
+       WM_operatortype_append(MESH_OT_flip_normals);
+       WM_operatortype_append(MESH_OT_knife_cut);
+       WM_operatortype_append(MESH_OT_rip);
+       
+       WM_operatortype_append(MESH_OT_uv_texture_add);
+       WM_operatortype_append(MESH_OT_uv_texture_remove);
+       WM_operatortype_append(MESH_OT_vertex_color_add);
+       WM_operatortype_append(MESH_OT_vertex_color_remove);
+       WM_operatortype_append(MESH_OT_sticky_add);
+       WM_operatortype_append(MESH_OT_sticky_remove);
+
+       WM_operatortype_append(MESH_OT_vertex_specials);
+       WM_operatortype_append(MESH_OT_edge_specials);
+       WM_operatortype_append(MESH_OT_face_specials);
+       WM_operatortype_append(MESH_OT_specials);
+       
+       /* macros */
+       ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
+       WM_operatortype_macro_define(ot, "MESH_OT_duplicate");
+       WM_operatortype_macro_define(ot, "TFM_OT_translate");
+
+       ot= WM_operatortype_append_macro("MESH_OT_rip_move", "Rip", OPTYPE_UNDO|OPTYPE_REGISTER);
+       WM_operatortype_macro_define(ot, "MESH_OT_rip");
+       WM_operatortype_macro_define(ot, "TFM_OT_translate");
+
+       ot= WM_operatortype_append_macro("MESH_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER);
+       WM_operatortype_macro_define(ot, "MESH_OT_extrude");
+       WM_operatortype_macro_define(ot, "TFM_OT_translate");
        
 }
 
@@ -153,57 +335,98 @@ void ED_operatortypes_mesh(void)
 void ED_keymap_mesh(wmWindowManager *wm)
 {      
        ListBase *keymap= WM_keymap_listbase(wm, "EditMesh", 0, 0);
+       wmKeymapItem *kmi;
        
        /* selecting */
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "type", 0);
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0)->ptr, "type", 1);
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0)->ptr, "type", 2);
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0)->ptr, "type", 3);
-       WM_keymap_add_item(keymap, "MESH_OT_de_select_all", AKEY, KM_PRESS, 0, 0);
+       /* standard mouse selection goes via space_view3d */
+       WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
+       kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0);
+       RNA_boolean_set(kmi->ptr, "extend", 1);
+       kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0);
+       RNA_boolean_set(kmi->ptr, "ring", 1);
+       kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0);
+       RNA_boolean_set(kmi->ptr, "extend", 1);
+       RNA_boolean_set(kmi->ptr, "ring", 1);
+
+       WM_keymap_add_item(keymap, "MESH_OT_select_shortest_path", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "MESH_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_selectswap_mesh", IKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "MESH_OT_select_non_manifold", MKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0);
        
-       WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh_all", LKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh", LKEY, KM_PRESS, 0, 0);
-       RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "deselect", 1);
+       WM_keymap_add_item(keymap, "MESH_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_select_linked_pick", LKEY, KM_PRESS, 0, 0);
+       RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_select_linked_pick", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "deselect", 1);
        
-       RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_linked_flat_faces", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0);
-       RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_sharp_edges", SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0);           
+       RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_faces_select_linked_flat", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0);
+       RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_edges_select_sharp", SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0);
        
-       /* transform keymap already defined, so no tweaks for select */
+       WM_keymap_add_item(keymap, "MESH_OT_vertices_transform_to_sphere", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT , 0);
+
+       WM_keymap_add_item(keymap, "MESH_OT_select_similar", GKEY, KM_PRESS, KM_SHIFT, 0);
+       
+       /* selection mode */
+       WM_keymap_add_item(keymap, "MESH_OT_selection_type", TABKEY, KM_PRESS, KM_CTRL, 0);
        
        /* hide */
-       WM_keymap_add_item(keymap, "MESH_OT_hide_mesh", HKEY, KM_PRESS, 0, 0);
-       RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_hide_mesh", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "swap", 1);
-       WM_keymap_add_item(keymap, "MESH_OT_reveal_mesh", HKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_hide", HKEY, KM_PRESS, 0, 0);
+       RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
+       WM_keymap_add_item(keymap, "MESH_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
        
        /* tools */
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_righthandfaces", NKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "select", 2);
-       RNA_int_set(WM_keymap_add_item(keymap, "MESH_OT_righthandfaces", NKEY, KM_PRESS, KM_CTRL, 0)->ptr, "select", 1);
+       WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0);
+       RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistent", NKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "inside", 1);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_extrude_move", EKEY, KM_PRESS, 0, 0);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_screw", NINEKEY, KM_PRESS, KM_CTRL, 0);
        
-       WM_keymap_add_item(keymap, "MESH_OT_subdivs", WKEY, KM_PRESS, 0, 0); // this is the menu
-       /*WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi_fractal", WKEY, KM_PRESS, KM_ALT, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_subdivide_smooth", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);*/
-       WM_keymap_add_item(keymap, "MESH_OT_removedoublesflag", VKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_extrude_mesh", EKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_edit_faces", PKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_fill", FKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_beauty_fill", FKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_tris_convert_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_edge_flip", FKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
        
+       WM_keymap_add_item(keymap, "MESH_OT_split", FOURKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_extrude_repeat", FOURKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_edge_rotate", FIVEKEY, KM_PRESS, KM_CTRL, 0);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_loop_to_region",SIXKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_region_to_loop",SIXKEY, KM_PRESS, KM_ALT, 0);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_uvs_rotate",SEVENKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_uvs_mirror",SEVENKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_colors_rotate",EIGHTKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_colors_mirror",EIGHTKEY, KM_PRESS, KM_ALT, 0);
 
-       WM_keymap_add_item(keymap, "MESH_OT_delete_mesh", XKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_rip_move",VKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_merge", MKEY, KM_PRESS, KM_ALT, 0);
 
-       /* add */
-       WM_keymap_add_item(keymap, "MESH_OT_add_edge_face", FKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_add_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
+       /* add/remove */
+       WM_keymap_add_item(keymap, "MESH_OT_edge_face_add", FKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "OBJECT_OT_mesh_add", AKEY, KM_PRESS, KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, KM_SHIFT, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
+                                               /* use KM_RELEASE because same key is used for tweaks */
+       WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_RELEASE, KM_CTRL, 0);
        
-       WM_keymap_add_item(keymap, "MESH_OT_make_fgon",MKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_clear_fgon",MKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0);
        
+       WM_keymap_add_item(keymap, "MESH_OT_fgon_make", FKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
+       
+       WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0);
+
+       /* menus */
+       WM_keymap_add_item(keymap, "MESH_OT_vertex_specials", VKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_edge_specials", EKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_face_specials", FKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_specials", WKEY, KM_PRESS, 0, 0);
        
+       /* UV's */
+       WM_keymap_add_item(keymap, "UV_OT_mapping_menu", UKEY, KM_PRESS, 0, 0);
 }