Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-07-17 15:30:29 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-07-17 17:30:42 +0300
commitc1bd5bcbfa5dcd63fc40b1f5f921b15e8be4bca3 (patch)
tree81982e2e56ce0c2ce9afdb37bafc1cc308a18bdc
parentb69c33aeba679665dc95c90fcced078b576dc527 (diff)
Fix T66091: paint curve point slide conflicts with 2D cursor
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py10
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py6
2 files changed, 10 insertions, 6 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index c06ce64b495..46de147693c 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -3483,15 +3483,17 @@ def km_paint_curve(params):
items.extend([
("paintcurve.add_point_slide", {"type": params.action_mouse, "value": 'PRESS', "ctrl": True}, None),
- ("paintcurve.select", {"type": params.select_mouse, "value": params.select_mouse_value}, None),
- ("paintcurve.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True},
+ ("paintcurve.select", {"type": params.select_mouse, "value": 'PRESS'},
+ {"properties": [("extend", False)]}),
+ ("paintcurve.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}),
- ("paintcurve.slide", {"type": params.action_mouse, "value": 'PRESS'}, None),
+ ("paintcurve.slide", {"type": params.action_mouse, "value": 'PRESS'},
+ {"properties": [("align", False)]}),
("paintcurve.slide", {"type": params.action_mouse, "value": 'PRESS', "shift": True},
{"properties": [("align", True)]}),
("paintcurve.select", {"type": 'A', "value": 'PRESS'},
{"properties": [("toggle", True)]}),
- ("paintcurve.cursor", {"type": params.action_mouse, "value": 'PRESS'}, None),
+ ("paintcurve.cursor", {"type": params.action_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, None),
("paintcurve.delete_point", {"type": 'X', "value": 'PRESS'}, None),
("paintcurve.delete_point", {"type": 'DEL', "value": 'PRESS'}, None),
("paintcurve.draw", {"type": 'RET', "value": 'PRESS'}, None),
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 2b7dd2357ab..fb451d1f6d4 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -2697,10 +2697,12 @@ def km_paint_curve(params):
items.extend([
("paintcurve.add_point_slide", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None),
- ("paintcurve.select", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+ ("paintcurve.select", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ {"properties": [("extend", False)]}),
("paintcurve.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}),
- ("paintcurve.slide", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+ ("paintcurve.slide", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ {"properties": [("align", False)]}),
("paintcurve.slide", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
{"properties": [("align", True)]}),
("paintcurve.select", {"type": 'A', "value": 'PRESS'},