diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-07-16 18:45:15 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-07-16 18:45:15 +0300 |
commit | 5f87af907d6bdb28754299d08fa5cdb065f9c35e (patch) | |
tree | 14e1be6c69f64493a3cea1d9791d510f8b0a6458 /release | |
parent | 030e86768b0acfb74e488e099673e4926c19953b (diff) | |
parent | 09a483a3aac34f0f4226de0bd23d7ec7e6eb3c4e (diff) |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'release')
-rw-r--r-- | release/darwin/background.tif | bin | 33768 -> 143624 bytes | |||
-rw-r--r-- | release/darwin/buildbot/background.tif | bin | 20286 -> 220950 bytes | |||
-rw-r--r-- | release/scripts/presets/keyconfig/blender.py | 15 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 14 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 7 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
6 files changed, 32 insertions, 6 deletions
diff --git a/release/darwin/background.tif b/release/darwin/background.tif Binary files differindex d8785b9c9a4..65d73a86389 100644 --- a/release/darwin/background.tif +++ b/release/darwin/background.tif diff --git a/release/darwin/buildbot/background.tif b/release/darwin/buildbot/background.tif Binary files differindex 5253a6bf439..8cf364599b1 100644 --- a/release/darwin/buildbot/background.tif +++ b/release/darwin/buildbot/background.tif diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py index 0bff9974aaa..cbdd01b3cbe 100644 --- a/release/scripts/presets/keyconfig/blender.py +++ b/release/scripts/presets/keyconfig/blender.py @@ -54,6 +54,15 @@ class Prefs(bpy.types.KeyConfigPreferences): default='PLAY', update=update_fn, ) + use_alt_click_leader: BoolProperty( + name="Alt Click Tool Prompt", + description=( + "Tapping Alt (without pressing any other keys) shows a prompt in the status-bar\n" + "prompting a second keystroke to activate the tool" + ), + default=False, + update=update_fn, + ) use_select_all_toggle: BoolProperty( name="Select All Toggles", description=( @@ -164,13 +173,16 @@ class Prefs(bpy.types.KeyConfigPreferences): col = layout.column() col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) col.row().prop(self, "spacebar_action", text="Spacebar Action", expand=True) + if is_select_left: col.row().prop(self, "gizmo_action", text="Activate Gizmo Event", expand=True) # Checkboxes sub-layout. col = layout.column() sub = col.column(align=True) - sub.prop(self, "use_select_all_toggle") + row = sub.row() + row.prop(self, "use_select_all_toggle") + row.prop(self, "use_alt_click_leader") # 3DView settings. col = layout.column() @@ -217,6 +229,7 @@ def load(): kc_prefs.select_mouse == 'LEFT' and kc_prefs.gizmo_action == 'DRAG' ), + use_alt_click_leader=kc_prefs.use_alt_click_leader, use_pie_click_drag=kc_prefs.use_pie_click_drag, ), ) diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 241a8240f49..8a9d3052a2e 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -52,6 +52,8 @@ class Params: "use_v3d_shade_ex_pie", # Swap orbit/pan keys (for 2D workflows). "use_v3d_mmb_pan", + # Alt click to access tools. + "use_alt_click_leader", # Experimental option. "use_pie_click_drag", "v3d_tilde_action", @@ -73,6 +75,7 @@ class Params: use_v3d_tab_menu=False, use_v3d_shade_ex_pie=False, use_v3d_mmb_pan=False, + use_alt_click_leader=False, use_pie_click_drag=False, v3d_tilde_action='VIEW', v3d_alt_mmb_drag_action='RELATIVE', @@ -126,6 +129,7 @@ class Params: self.v3d_tilde_action = v3d_tilde_action self.v3d_alt_mmb_drag_action = v3d_alt_mmb_drag_action + self.use_alt_click_leader = use_alt_click_leader self.use_pie_click_drag = use_pie_click_drag if not use_pie_click_drag: self.pie_value = 'PRESS' @@ -449,11 +453,15 @@ def km_window(params): op_menu("TOPBAR_MT_file_context_menu", {"type": 'F4', "value": 'PRESS'}), # Pass through when when no tool-system exists or the fallback isn't available. ("wm.toolbar_fallback_pie", {"type": 'W', "value": 'PRESS', "alt": True}, None), - # Alt as "Leader-Key". - ("wm.toolbar_prompt", {"type": 'LEFT_ALT', "value": 'CLICK'}, None), - ("wm.toolbar_prompt", {"type": 'RIGHT_ALT', "value": 'CLICK'}, None), ]) + if params.use_alt_click_leader: + items.extend([ + # Alt as "Leader-Key". + ("wm.toolbar_prompt", {"type": 'LEFT_ALT', "value": 'CLICK'}, None), + ("wm.toolbar_prompt", {"type": 'RIGHT_ALT', "value": 'CLICK'}, None), + ]) + if params.spacebar_action == 'TOOL': items.append( ("wm.toolbar", {"type": 'SPACE', "value": 'PRESS'}, None), diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 651866cf316..75c1bb5e3f9 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -699,7 +699,12 @@ class IMAGE_HT_header(Header): # Proportional Editing row = layout.row(align=True) - row.prop(tool_settings, "use_proportional_edit", icon_only=True) + row.prop( + tool_settings, + "use_proportional_edit", + icon_only=True, + icon='PROP_CON' if tool_settings.use_proportional_connected else 'PROP_ON', + ) sub = row.row(align=True) sub.active = tool_settings.use_proportional_edit sub.prop_with_popover( diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c7556dad4fe..fe80a0c1c36 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1102,7 +1102,7 @@ class VIEW3D_MT_mirror(Menu): for axis_index, axis_name in enumerate("XYZ"): props = layout.operator("transform.mirror", text=f"{axis_name!s} {space_name!s}") props.constraint_axis[axis_index] = True - props.orient_type = 'GLOBAL' + props.orient_type = space_id if space_id == 'GLOBAL': layout.separator() |