diff options
author | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
commit | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (patch) | |
tree | f03a5935ee7dbc4c7ddabaee1c06570a26f698f9 /release/scripts/presets | |
parent | 390c4efa0c15b39e2d1971bc81464cffae56d102 (diff) | |
parent | e795ba1529a28ec276a5178fda2025e5ec071bbf (diff) |
Merge remote-tracking branch 'origin/master' into geometry-nodes
Diffstat (limited to 'release/scripts/presets')
3 files changed, 13 insertions, 5 deletions
diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py index d24735ba8b7..113e99fed42 100644 --- a/release/scripts/presets/keyconfig/blender.py +++ b/release/scripts/presets/keyconfig/blender.py @@ -168,6 +168,7 @@ class Prefs(bpy.types.KeyConfigPreferences): def draw(self, layout): layout.use_property_split = True + layout.use_property_decorate = False is_select_left = (self.select_mouse == 'LEFT') diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py index a02ac895efb..efb013b9216 100644 --- a/release/scripts/presets/keyconfig/blender_27x.py +++ b/release/scripts/presets/keyconfig/blender_27x.py @@ -33,11 +33,11 @@ class Prefs(bpy.types.KeyConfigPreferences): ) def draw(self, layout): - split = layout.split() - col = split.column() - col.label(text="Select With:") - col.row().prop(self, "select_mouse", expand=True) - split.column() + layout.use_property_split = True + layout.use_property_decorate = False + + col = layout.column() + col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) blender_default = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "blender_default.py")) 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 d1a595f04c8..54731c7139f 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -447,6 +447,13 @@ def km_property_editor(params): {"properties": [("direction", 'PREV'), ], },), ("screen.space_context_cycle", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "ctrl": True}, {"properties": [("direction", 'NEXT'), ], },), + ("buttons.start_filter", {"type": 'F', "value": 'PRESS', "ctrl": True}, None), + ("buttons.clear_filter", {"type": 'ESC', "value": 'PRESS'}, None), + # Modifier panels + ("object.modifier_set_active", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), + ("object.modifier_remove", {"type": 'BACK_SPACE', "value": 'PRESS'}, {"properties": [("report", True)]}), + ("object.modifier_remove", {"type": 'DEL', "value": 'PRESS'}, {"properties": [("report", True)]}), + ("object.modifier_copy", {"type": 'D', "value": 'PRESS', "ctrl": True}, None), ]) return keymap |