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:
authorAaron Carlisle <Blendify>2021-08-08 20:30:30 +0300
committerAaron Carlisle <carlisle.b3d@gmail.com>2021-08-08 20:30:52 +0300
commit0be26f563e63dcf9fa725c27bf713b0b09bc4372 (patch)
treefcf6a92e7b9d9783fe2d127a3add31b81447438e /release
parent76e24609fd6133023ddff5d16fea8cbc74e45207 (diff)
UI: Sequencer: Fix placement of display options in sequencer & preview mode
This commit does two things, first it removes the proportional editing tool settings. This is not accessible code and is has not been used since the grease pencil/annotations changes in 2.8. Second, this patch reorders the if statements so that the display options are always shown on the rightside. Reviewed By: antoniov Differential Revision: https://developer.blender.org/D12163
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py18
1 files changed, 4 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 30467521c3d..20fb39e8c1f 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -148,20 +148,6 @@ class SEQUENCER_HT_header(Header):
layout.separator_spacer()
- if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
- layout.prop(st, "display_mode", text="", icon_only=True)
- layout.prop(st, "preview_channels", text="", icon_only=True)
-
- gpd = context.gpencil_data
- tool_settings = context.tool_settings
-
- # Proportional editing
- if gpd and gpd.use_stroke_edit_mode:
- row = layout.row(align=True)
- row.prop(tool_settings, "use_proportional_edit", icon_only=True)
- if tool_settings.use_proportional_edit:
- row.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
-
if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}:
tool_settings = context.tool_settings
row = layout.row(align=True)
@@ -170,6 +156,10 @@ class SEQUENCER_HT_header(Header):
sub.popover(panel="SEQUENCER_PT_snapping")
layout.separator_spacer()
+ if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
+ layout.prop(st, "display_mode", text="", icon_only=True)
+ layout.prop(st, "preview_channels", text="", icon_only=True)
+
row = layout.row(align=True)
row.prop(st, "show_strip_overlay", text="", icon='OVERLAY')
sub = row.row(align=True)