diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-04-20 11:36:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-20 11:36:48 +0300 |
| commit | 5f5ec7b0ed5a110edd118fae00632384e51b62c2 (patch) | |
| tree | 0266d1e52e24fdee264be5fb02fbb82fb53f17c7 | |
| parent | 0e7871f9c30142866427ae87e81c0cf516ff3320 (diff) | |
| parent | 005bba2a81f3d955209c4b004632ce7ba7043cf6 (diff) | |
Merge branch 'blender-v2.83-release'
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 8140ed4d449..09e9556cf2c 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -6532,10 +6532,15 @@ def km_sequencer_editor_tool_select_box(params): return ( "Sequencer Tool: Select Box", {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, - {"items": _template_items_tool_select_actions_simple( - "sequencer.select_box", type=params.tool_tweak, value='ANY', - properties=[("tweak", True)], - )}, + {"items": [ + *_template_items_tool_select_actions_simple( + "sequencer.select_box", type=params.tool_tweak, value='ANY', + properties=[("tweak", params.select_mouse == 'LEFTMOUSE')], + ), + # RMB select can already set the frame, match the tweak tool. + *(_template_items_change_frame(params) + if params.select_mouse == 'LEFTMOUSE' else []), + ]}, ) |