Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-18 04:39:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-18 04:57:49 +0400
commit2b0aa105f78c785897a309ed77fb5855082ceafe (patch)
tree91181d0a8dabc43bd38b021a6ca8176f32f01439 /release
parentc4bebc06325abf3a7420d5d07d9bf29b1a6f578b (diff)
NDOF: show invert pan & zoom in the menu outside the 3d view
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py24
1 files changed, 14 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index dc2ff0d8544..fbaa06f7aa3 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')