[Bf-blender-cvs] [5eb4209167f] soc-2021-curves: Merge branch 'master' into soc-2021-curves

[dilithjay]

Commit: 5eb4209167f93dcb5c71a135ba097d3e2a62fd9f
Author: dilithjay
Date:   Wed Sep 22 11:17:55 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB5eb4209167f93dcb5c71a135ba097d3e2a62fd9f

Merge branch 'master' into soc-2021-curves

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 94af2e45ebd,a2edf5e541d..b171cd121cc
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -4280,8 -4371,9 +4371,10 @@@ def km_curve(params)
          ("curve.dissolve_verts", {"type": 'X', "value": 'PRESS', "ctrl": True}, None),
          ("curve.dissolve_verts", {"type": 'DEL', "value": 'PRESS', "ctrl": True}, None),
          ("curve.tilt_clear", {"type": 'T', "value": 'PRESS', "alt": True}, None),
 +        ("curve.pen", {"type": 'X', "value": 'PRESS', "alt": True}, None),
-         ("transform.tilt", {"type": 'T', "value": 'PRESS', "ctrl": True}, None),
+         op_tool_optional(
+             ("transform.tilt", {"type": 'T', "value": 'PRESS', "ctrl": True}, None),
+             (op_tool_cycle, "builtin.tilt"), params),
          ("transform.transform", {"type": 'S', "value": 'PRESS', "alt": True},
           {"properties": [("mode", 'CURVE_SHRINKFATTEN')]}),
          ("curve.reveal", {"type": 'H', "value": 'PRESS', "alt": True}, None),
diff --cc tests/performance/benchmark
index ad1e07d0ef3,a58c339e9f8..a58c339e9f8
mode 100644,100755..100644
--- a/tests/performance/benchmark
+++ b/tests/performance/benchmark