Index: blender25/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- blender25/source/blender/editors/space_view3d/view3d_ops.c    (revision 23693) 
+++ blender25/source/blender/editors/space_view3d/view3d_ops.c    (working copy) 
@@ -138,30 +138,30 @@
     RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_all", CKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "center", 1);
 
     /* numpad view hotkeys*/
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_CAMERA); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_FRONT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", PAD2, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPDOWN); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_RIGHT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", PAD4, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPLEFT); 
-    WM_keymap_add_item(keymap, "VIEW3D_OT_view_persportho", PAD5, KM_PRESS, 0, 0); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", ZEROKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_CAMERA); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", ONEKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_FRONT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", TWOKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPDOWN); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", THREEKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_RIGHT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", FOURKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPLEFT); 
+    WM_keymap_add_item(keymap, "VIEW3D_OT_view_persportho", FIVEKEY, KM_PRESS, 0, 0); 
     
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", PAD6, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPRIGHT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_TOP); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", PAD8, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPUP); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_BACK); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_LEFT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_BOTTOM); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", PAD2, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANDOWN); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", PAD4, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANLEFT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", PAD6, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANRIGHT); 
-    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", PAD8, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANUP); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", SIXKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPRIGHT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", SEVENKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_TOP); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_orbit", EIGHTKEY, KM_PRESS, 0, 0)->ptr, "type", V3D_VIEW_STEPUP); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", ONEKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_BACK); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", THREEKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_LEFT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", SEVENKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_BOTTOM); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", TWOKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANDOWN); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", FOURKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANLEFT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", SIXKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANRIGHT); 
+    RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_view_pan", EIGHTKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", V3D_VIEW_PANUP); 
 
     WM_keymap_add_item(keymap, "VIEW3D_OT_localview", PADSLASHKEY, KM_PRESS, 0, 0);
     
     WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0, 0);
     
     /* layers, shift + alt are properties set in invoke() */
-    RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ACCENTGRAVEKEY, KM_PRESS, 0, 0)->ptr, "nr", 0); 
+    /*RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ACCENTGRAVEKEY, KM_PRESS, 0, 0)->ptr, "nr", 0); 
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ONEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 1);
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", TWOKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 2);
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", THREEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 3);
@@ -171,7 +171,7 @@
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", SEVENKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 7);
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", EIGHTKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 8);
     RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", NINEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 9);
-    RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ZEROKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 10); 
+    RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ZEROKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 10);*/ 
     
     /* drawtype */
     km = WM_keymap_add_item(keymap, "VIEW3D_OT_drawtype", ZKEY, KM_PRESS, 0, 0);