[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37987] trunk/blender/source/blender: fix for own mistake with key shortcuts r37850

[Campbell Barton]

Revision: 37987
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37987
Author:   campbellbarton
Date:     2011-06-30 15:43:38 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
fix for own mistake with key shortcuts r37850

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37850

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/key.c
    trunk/blender/source/blender/editors/armature/armature_ops.c

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2011-06-30 15:02:03 UTC (rev 37986)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2011-06-30 15:43:38 UTC (rev 37987)
@@ -1032,7 +1032,7 @@
 	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");
 

Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c	2011-06-30 15:02:03 UTC (rev 37986)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c	2011-06-30 15:43:38 UTC (rev 37987)
@@ -265,7 +265,7 @@
 	
 		/* 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 @@
 	
 		/* 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 */