[Bf-blender-cvs] [60229ac068c] tracking_tools: Merge branch 'master' into tracking_tools

[Sebastian Koenig]

Commit: 60229ac068c943f3f6ebbe386004dcff24d0f964
Author: Sebastian Koenig
Date:   Thu Sep 23 08:25:11 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB60229ac068c943f3f6ebbe386004dcff24d0f964

Merge branch 'master' into tracking_tools

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index a040282d59a,5ecbe7715e3..2cc52de62ee
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -1459,10 -1474,11 +1474,11 @@@ def km_mask_editing(params)
          *_template_items_hide_reveal_actions("mask.hide_view_set", "mask.hide_view_clear"),
          ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, None),
          ("mask.cyclic_toggle", {"type": 'C', "value": 'PRESS', "alt": True}, None),
 -        ("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
 -        ("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
 +        # ("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
 +        # ("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
          ("mask.handle_type_set", {"type": 'V', "value": 'PRESS'}, None),
-         ("mask.normals_make_consistent", {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None),
+         ("mask.normals_make_consistent",
+          {"type": 'N', "value": 'PRESS', "ctrl" if params.legacy else "shift": True}, None),
          ("mask.parent_set", {"type": 'P', "value": 'PRESS', "ctrl": True}, None),
          ("mask.parent_clear", {"type": 'P', "value": 'PRESS', "alt": True}, None),
          ("mask.shape_key_insert", {"type": 'I', "value": 'PRESS'}, None),