diff options
author | Ton Roosendaal <ton@blender.org> | 2013-02-08 16:12:57 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-02-08 16:12:57 +0400 |
commit | 1dfb6404b78396988fedf5ad2bd111c6af13cf12 (patch) | |
tree | 5ea0a8cdc2aaf8cbb25c27b5082db3ac9415657d /release | |
parent | 08326778c5c24bf9d0592264dabfea094057b471 (diff) |
Release todo: added userpref for Mac users having "Natural Scroll" set.
As per discussion and analysis of all trackpad usage, we now
follow this convention:
- Blender follows system setting for trackpad direction preference.
- If you set your system to "natural" scroll, we need to invert a couple
of cases in Blender we do "natural" already. Like:
- view rotate (the inversed option just never feels ok)
- scroll active items in list or pulldown menu (up/down is absolute)
- ALT+scroll values in buttons (up/down is absolute)
The new User Preference setting "Trackpad Natural" handles this.
For 2.66 we only have trackpad handling for OS X... so this isn't
affecting trackpad usage in Windows and Linux, which stick to be mapped
to Scroll Wheel still.
(Note: viewrotate now is "natural" always, changing how it worked in the
past weeks).
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/matcaps/license.txt | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/release/datafiles/matcaps/license.txt b/release/datafiles/matcaps/license.txt index 2670a62e311..358c8dcd832 100644 --- a/release/datafiles/matcaps/license.txt +++ b/release/datafiles/matcaps/license.txt @@ -1,3 +1,3 @@ These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code. -Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork for making the pictures. +Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork and David Silverman for making the pictures. diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 2a2db40310c..32eb1a593eb 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -963,6 +963,8 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel): return (userpref.active_section == 'INPUT') def draw_input_prefs(self, inputs, layout): + import sys + # General settings row = layout.row() col = row.column() @@ -1015,6 +1017,11 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel): sub.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction") #sub.prop(view, "wheel_scroll_lines", text="Scroll Lines") + if sys.platform == "darwin": + sub = col.column() + sub.label(text="Trackpad:") + sub.prop(inputs, "use_trackpad_natural") + col.separator() sub = col.column() sub.label(text="NDOF Device:") |