Commit: b3e1620e21ba659661c1e274878cca0b19fbbf7b
Author: Yevgeny Makarov
Date: Fri Sep 25 14:39:45 2020 +1000
Branches: master
https://developer.blender.org/rBb3e1620e21ba659661c1e274878cca0b19fbbf7b
Keymap: orbit/pan preference now applies to the track-pad as well
Ref D7279
===================================================================
M release/scripts/presets/keyconfig/blender.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/blender.py
b/release/scripts/presets/keyconfig/blender.py
index cbdd01b3cbe..d24735ba8b7 100644
--- a/release/scripts/presets/keyconfig/blender.py
+++ b/release/scripts/presets/keyconfig/blender.py
@@ -121,14 +121,16 @@ class Prefs(bpy.types.KeyConfigPreferences):
name="MMB Action",
items=(
('ORBIT', "Orbit",
- "Orbit",
+ "",
0),
('PAN', "Pan",
- "Set the view axis where each mouse direction always maps to the
same axis",
+ "",
1),
),
description=(
- "The action when Middle-Mouse dragging in the viewport.
Shift-Middle-Mouse is used for the other action"
+ "The action when Middle-Mouse dragging in the viewport. "
+ "Shift-Middle-Mouse is used for the other action. "
+ "This applies to Track-Pad as well"
),
update=update_fn,
)
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index c68cc016fc5..fdd654009a7 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1008,12 +1008,17 @@ def km_view3d(params):
("view3d.localview", {"type": 'MOUSESMARTZOOM', "value": 'ANY'}, None),
("view3d.localview_remove_from", {"type": 'M', "value": 'PRESS'},
None),
# Navigation.
+ ("view3d.rotate", {"type": 'MOUSEROTATE', "value": 'ANY'}, None),
*((
("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS',
"shift": True}, None),
("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
+ ("view3d.rotate", {"type": 'TRACKPADPAN', "value": 'ANY', "shift":
True}, None),
+ ("view3d.move", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
) if params.use_v3d_mmb_pan else (
("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift":
True}, None),
+ ("view3d.rotate", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
+ ("view3d.move", {"type": 'TRACKPADPAN', "value": 'ANY', "shift":
True}, None),
)),
("view3d.zoom", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "ctrl":
True}, None),
("view3d.dolly", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift":
True, "ctrl": True}, None),
@@ -1022,9 +1027,6 @@ def km_view3d(params):
("view3d.view_selected", {"type": 'NUMPAD_PERIOD', "value": 'PRESS'},
{"properties": [("use_all_regions", False)]}),
("view3d.smoothview", {"type": 'TIMER1', "value": 'ANY', "any": True},
None),
- ("view3d.rotate", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),
- ("view3d.rotate", {"type": 'MOUSEROTATE', "value": 'ANY'}, None),
- ("view3d.move", {"type": 'TRACKPADPAN', "value": 'ANY', "shift":
True}, None),
("view3d.zoom", {"type": 'TRACKPADZOOM', "value": 'ANY'}, None),
("view3d.zoom", {"type": 'TRACKPADPAN', "value": 'ANY', "ctrl": True},
None),
("view3d.zoom", {"type": 'NUMPAD_PLUS', "value": 'PRESS'},
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
