[Bf-blender-cvs] [2b0aa10] master: NDOF: show invert pan & zoom in the menu outside the 3d view

[Campbell Barton]

Commit: 2b0aa105f78c785897a309ed77fb5855082ceafe
Author: Campbell Barton
Date:   Tue Feb 18 11:39:26 2014 +1100
https://developer.blender.org/rB2b0aa105f78c785897a309ed77fb5855082ceafe

NDOF: show invert pan & zoom in the menu outside the 3d view

===================================================================

M	release/scripts/startup/bl_ui/space_userpref.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index dc2ff0d..fbaa06f 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -950,11 +950,12 @@ class USERPREF_MT_ndof_settings(Menu):
 
         input_prefs = context.user_preferences.inputs
 
-        layout.separator()
         layout.prop(input_prefs, "ndof_sensitivity")
         layout.prop(input_prefs, "ndof_orbit_sensitivity")
 
-        if context.space_data.type == 'VIEW_3D':
+        is_view3d = context.space_data.type == 'VIEW_3D'
+
+        if is_view3d:
             layout.separator()
             layout.prop(input_prefs, "ndof_show_guide")
 
@@ -965,16 +966,19 @@ class USERPREF_MT_ndof_settings(Menu):
             layout.prop(input_prefs, "ndof_tilt_invert_axis")
             layout.prop(input_prefs, "ndof_rotate_invert_axis")
 
-            layout.separator()
-            layout.label(text="Pan options")
-            layout.prop(input_prefs, "ndof_panx_invert_axis")
-            layout.prop(input_prefs, "ndof_pany_invert_axis")
-            layout.prop(input_prefs, "ndof_panz_invert_axis")
-            layout.prop(input_prefs, "ndof_pan_yz_swap_axis")
 
-            layout.label(text="Zoom options")
-            layout.prop(input_prefs, "ndof_zoom_invert")
+        # view2d use pan/zoom
+        layout.separator()
+        layout.label(text="Pan options")
+        layout.prop(input_prefs, "ndof_panx_invert_axis")
+        layout.prop(input_prefs, "ndof_pany_invert_axis")
+        layout.prop(input_prefs, "ndof_panz_invert_axis")
+        layout.prop(input_prefs, "ndof_pan_yz_swap_axis")
+
+        layout.label(text="Zoom options")
+        layout.prop(input_prefs, "ndof_zoom_invert")
 
+        if is_view3d:
             layout.separator()
             layout.label(text="Fly/Walk options")
             layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')