fix for own mistake with key shortcuts r37850
authorCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jun 2011 15:43:38 +0000 (15:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jun 2011 15:43:38 +0000 (15:43 +0000)
source/blender/blenkernel/intern/key.c
source/blender/editors/armature/armature_ops.c

index cf5fe1c3740828c95def5de099aa96040b1ab775..8b0cfb1d1563eeb9dad13082dd626f11f97b4f16 100644 (file)
@@ -1032,7 +1032,7 @@ static float *get_weights_array(Object *ob, char *vgroup)
        defgrp_index= defgroup_name_index(ob, vgroup);
        if(defgrp_index >= 0) {
                float *weights;
-               int i, j;
+               int i;
                
                weights= MEM_callocN(totvert*sizeof(float), "weights");
 
index 7bc9bb48a4c63f8a516eb6f4aa61be6cb019c9c0..16b748737ca6505219b133a727cdbe3672a105b5 100644 (file)
@@ -265,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, 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_disable", WKEY, KM_PRESS, KM_ALT, 0);
                
                /* armature/bone layers */
@@ -343,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, 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_disable", WKEY, KM_PRESS, KM_ALT, 0);
 
                /* armature/bone layers */