3D View: split view-numpad into two operators

Naming operator based on keys it used was strange,
split into view-axis and view-camera.

2 files changed, 36 insertions, 37 deletions

diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py
index e047364a9e3..e2a4c37cdad 100644
--- a/release/scripts/presets/keyconfig/blender_27x.py
+++ b/release/scripts/presets/keyconfig/blender_27x.py
@@ -2208,28 +2208,27 @@ kmi_props_setattr(kmi.properties, 'use_all_regions', True)
 kmi_props_setattr(kmi.properties, 'center', False)
 kmi = km.keymap_items.new('view3d.view_all', 'C', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'center', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_0', 'PRESS')
-kmi_props_setattr(kmi.properties, 'type', 'CAMERA')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_camera', 'NUMPAD_0', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_1', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'FRONT')
 kmi = km.keymap_items.new('view3d.view_orbit', 'NUMPAD_2', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'ORBITDOWN')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_3', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
 kmi = km.keymap_items.new('view3d.view_orbit', 'NUMPAD_4', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'ORBITLEFT')
 kmi = km.keymap_items.new('view3d.view_persportho', 'NUMPAD_5', 'PRESS')
 kmi = km.keymap_items.new('view3d.view_orbit', 'NUMPAD_6', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'ORBITRIGHT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_7', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'TOP')
 kmi = km.keymap_items.new('view3d.view_orbit', 'NUMPAD_8', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'ORBITUP')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_1', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'BACK')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_3', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_7', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'BOTTOM')
 kmi = km.keymap_items.new('view3d.view_pan', 'NUMPAD_2', 'PRESS', ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'PANDOWN')
@@ -2266,22 +2265,22 @@ kmi = km.keymap_items.new('view3d.view_roll', 'WHEELUPMOUSE', 'PRESS', shift=Tru
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
 kmi = km.keymap_items.new('view3d.view_roll', 'WHEELDOWNMOUSE', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_1', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'FRONT')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_3', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_7', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'TOP')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_1', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'BACK')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_3', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NUMPAD_7', 'PRESS', shift=True, ctrl=True)
 kmi_props_setattr(kmi.properties, 'type', 'BOTTOM')
 kmi_props_setattr(kmi.properties, 'align_active', True)
 kmi = km.keymap_items.new('view3d.ndof_orbit_zoom', 'NDOF_MOTION', 'ANY')
@@ -2294,25 +2293,25 @@ kmi = km.keymap_items.new('view3d.view_roll', 'NDOF_BUTTON_ROLL_CCW', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
 kmi = km.keymap_items.new('view3d.view_roll', 'NDOF_BUTTON_ROLL_CCW', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_FRONT', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_FRONT', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'FRONT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_BACK', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_BACK', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'BACK')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_LEFT', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_LEFT', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'LEFT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_RIGHT', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_RIGHT', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_TOP', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_TOP', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'TOP')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_BOTTOM', 'PRESS')
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_BOTTOM', 'PRESS')
 kmi_props_setattr(kmi.properties, 'type', 'BOTTOM')
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_FRONT', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_FRONT', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'FRONT')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_RIGHT', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_RIGHT', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'RIGHT')
 kmi_props_setattr(kmi.properties, 'align_active', True)
-kmi = km.keymap_items.new('view3d.viewnumpad', 'NDOF_BUTTON_TOP', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.view_axis', 'NDOF_BUTTON_TOP', 'PRESS', shift=True)
 kmi_props_setattr(kmi.properties, 'type', 'TOP')
 kmi_props_setattr(kmi.properties, 'align_active', True)
 kmi = km.keymap_items.new('view3d.layers', 'ACCENT_GRAVE', 'PRESS')
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1ed33b78706..4614a4bd84a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -573,7 +573,7 @@ class VIEW3D_MT_view_cameras(Menu):
         layout = self.layout
 
         layout.operator("view3d.object_as_camera")
-        layout.operator("view3d.viewnumpad", text="Active Camera").type = 'CAMERA'
+        layout.operator("view3d.view_camera", text="Active Camera")
 
 
 class VIEW3D_MT_view_viewpoint(Menu):
@@ -582,22 +582,22 @@ class VIEW3D_MT_view_viewpoint(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("view3d.viewnumpad", text="Camera").type = 'CAMERA'
+        layout.operator("view3d.view_camera", text="Camera")
 
         layout.separator()
 
-        layout.operator("view3d.viewnumpad", text="Top").type = 'TOP'
-        layout.operator("view3d.viewnumpad", text="Bottom").type = 'BOTTOM'
+        layout.operator("view3d.view_axis", text="Top").type = 'TOP'
+        layout.operator("view3d.view_axis", text="Bottom").type = 'BOTTOM'
 
         layout.separator()
 
-        layout.operator("view3d.viewnumpad", text="Front").type = 'FRONT'
-        layout.operator("view3d.viewnumpad", text="Back").type = 'BACK'
+        layout.operator("view3d.view_axis", text="Front").type = 'FRONT'
+        layout.operator("view3d.view_axis", text="Back").type = 'BACK'
 
         layout.separator()
 
-        layout.operator("view3d.viewnumpad", text="Right").type = 'RIGHT'
-        layout.operator("view3d.viewnumpad", text="Left").type = 'LEFT'
+        layout.operator("view3d.view_axis", text="Right").type = 'RIGHT'
+        layout.operator("view3d.view_axis", text="Left").type = 'LEFT'
 
 
 class VIEW3D_MT_view_navigation(Menu):
@@ -661,27 +661,27 @@ class VIEW3D_MT_view_align_selected(Menu):
     def draw(self, context):
         layout = self.layout
 
-        props = layout.operator("view3d.viewnumpad", text="Top")
+        props = layout.operator("view3d.view_axis", text="Top")
         props.align_active = True
         props.type = 'TOP'
 
-        props = layout.operator("view3d.viewnumpad", text="Bottom")
+        props = layout.operator("view3d.view_axis", text="Bottom")
         props.align_active = True
         props.type = 'BOTTOM'
 
-        props = layout.operator("view3d.viewnumpad", text="Front")
+        props = layout.operator("view3d.view_axis", text="Front")
         props.align_active = True
         props.type = 'FRONT'
 
-        props = layout.operator("view3d.viewnumpad", text="Back")
+        props = layout.operator("view3d.view_axis", text="Back")
         props.align_active = True
         props.type = 'BACK'
 
-        props = layout.operator("view3d.viewnumpad", text="Right")
+        props = layout.operator("view3d.view_axis", text="Right")
         props.align_active = True
         props.type = 'RIGHT'
 
-        props = layout.operator("view3d.viewnumpad", text="Left")
+        props = layout.operator("view3d.view_axis", text="Left")
         props.align_active = True
         props.type = 'LEFT'