svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / editors / armature / armature_ops.c
index d962c9fdf2655f357a9d63ec7cb6599363421f15..7bc9bb48a4c63f8a516eb6f4aa61be6cb019c9c0 100644 (file)
@@ -85,8 +85,6 @@ void ED_operatortypes_armature(void)
        WM_operatortype_append(ARMATURE_OT_autoside_names);
        WM_operatortype_append(ARMATURE_OT_flip_names);
        
-       WM_operatortype_append(ARMATURE_OT_flags_set);
-       
        WM_operatortype_append(ARMATURE_OT_layers_show_all);
        WM_operatortype_append(ARMATURE_OT_armature_layers);
        WM_operatortype_append(ARMATURE_OT_bone_layers);
@@ -141,8 +139,6 @@ void ED_operatortypes_armature(void)
 
        WM_operatortype_append(POSE_OT_quaternions_flip);
        
-       WM_operatortype_append(POSE_OT_flags_set);
-       
        WM_operatortype_append(POSE_OT_armature_layers);
        WM_operatortype_append(POSE_OT_bone_layers);
        
@@ -269,7 +265,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
        
                /* set flags */
        WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
-       WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+       WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_disable", WKEY, KM_PRESS, KM_ALT, 0);
                
                /* armature/bone layers */
@@ -347,7 +343,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
        
                /* set flags */
        WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
-       WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+       WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_disable", WKEY, KM_PRESS, KM_ALT, 0);
 
                /* armature/bone layers */