[Bf-blender-cvs] [192314b9d37] master: Merge branch 'blender-v2.82-release'

[Campbell Barton]

Commit: 192314b9d37f92b6ca8b7e72bd4c5105776416ea
Author: Campbell Barton
Date:   Fri Feb 7 13:57:27 2020 +1100
Branches: master
https://developer.blender.org/rB192314b9d37f92b6ca8b7e72bd4c5105776416ea

Merge branch 'blender-v2.82-release'

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 66e9bdef122,cc480a43de3..d90aaceff60
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -946,11 -948,15 +950,16 @@@ def km_view3d(params)
          # Visibility.
          ("view3d.localview", {"type": 'NUMPAD_SLASH', "value": 'PRESS'}, None),
          ("view3d.localview", {"type": 'SLASH', "value": 'PRESS'}, None),
 +        ("view3d.localview", {"type": 'MOUSESMARTZOOM', "value": 'ANY'}, None),
          ("view3d.localview_remove_from", {"type": 'M', "value": 'PRESS'}, None),
          # Navigation.
-         ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
-         ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
+         *((
+             ("view3d.rotate", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
+             ("view3d.move", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, 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.zoom", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "ctrl": True}, None),
          ("view3d.dolly", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True, "ctrl": True}, None),
          ("view3d.view_selected", {"type": 'NUMPAD_PERIOD', "value": 'PRESS', "ctrl": True},