VSE: Disable interactivity in combined view
Combined view of timeline and preview causes seemingly unpredictable behavior after some operators have been allowed to run in preview region. Disable new features in this combined view, so behavior should be consistent with previous versions. ref: https://developer.blender.org/T92584 Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D13419
This commit is contained in:
@@ -41,7 +41,7 @@ def _space_view_types(st):
|
||||
view_type = st.view_type
|
||||
return (
|
||||
view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'},
|
||||
view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'},
|
||||
view_type == 'PREVIEW',
|
||||
)
|
||||
|
||||
|
||||
@@ -196,10 +196,6 @@ class SEQUENCER_HT_header(Header):
|
||||
row = layout.row(align=True)
|
||||
row.prop(sequencer_tool_settings, "overlap_mode", text="")
|
||||
|
||||
if st.view_type == 'SEQUENCER_PREVIEW':
|
||||
row = layout.row(align=True)
|
||||
row.prop(sequencer_tool_settings, "pivot_point", text="", icon_only=True)
|
||||
|
||||
if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}:
|
||||
row = layout.row(align=True)
|
||||
row.prop(tool_settings, "use_snap_sequencer", text="")
|
||||
@@ -248,7 +244,8 @@ class SEQUENCER_MT_editor_menus(Menu):
|
||||
|
||||
layout.menu("SEQUENCER_MT_strip")
|
||||
|
||||
layout.menu("SEQUENCER_MT_image")
|
||||
if st.view_type in {'SEQUENCER', 'PREVIEW'}:
|
||||
layout.menu("SEQUENCER_MT_image")
|
||||
|
||||
|
||||
class SEQUENCER_PT_gizmo_display(Panel):
|
||||
@@ -576,10 +573,6 @@ class SEQUENCER_MT_select(Menu):
|
||||
st = context.space_data
|
||||
has_sequencer, has_preview = _space_view_types(st)
|
||||
|
||||
# FIXME: this doesn't work for both preview + window region.
|
||||
if has_preview:
|
||||
layout.operator_context = 'INVOKE_REGION_PREVIEW'
|
||||
|
||||
layout.operator("sequencer.select_all", text="All").action = 'SELECT'
|
||||
layout.operator("sequencer.select_all", text="None").action = 'DESELECT'
|
||||
layout.operator("sequencer.select_all", text="Invert").action = 'INVERT'
|
||||
@@ -821,7 +814,6 @@ class SEQUENCER_MT_strip_transform(Menu):
|
||||
else:
|
||||
layout.operator_context = 'INVOKE_REGION_WIN'
|
||||
|
||||
# FIXME: mixed preview/sequencer views.
|
||||
if has_preview:
|
||||
layout.operator("transform.translate", text="Move")
|
||||
layout.operator("transform.rotate", text="Rotate")
|
||||
@@ -917,12 +909,6 @@ class SEQUENCER_MT_strip(Menu):
|
||||
st = context.space_data
|
||||
has_sequencer, has_preview = _space_view_types(st)
|
||||
|
||||
# FIXME: this doesn't work for both preview + window region.
|
||||
if has_preview:
|
||||
layout.operator_context = 'INVOKE_REGION_PREVIEW'
|
||||
else:
|
||||
layout.operator_context = 'INVOKE_REGION_WIN'
|
||||
|
||||
layout.menu("SEQUENCER_MT_strip_transform")
|
||||
layout.separator()
|
||||
|
||||
|
||||
@@ -3153,14 +3153,7 @@ class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel):
|
||||
],
|
||||
'SEQUENCER_PREVIEW': [
|
||||
*_tools_select,
|
||||
_defs_sequencer_generic.cursor,
|
||||
None,
|
||||
_defs_sequencer_generic.translate,
|
||||
_defs_sequencer_generic.rotate,
|
||||
_defs_sequencer_generic.scale,
|
||||
_defs_sequencer_generic.transform,
|
||||
None,
|
||||
_defs_sequencer_generic.sample,
|
||||
*_tools_annotate,
|
||||
None,
|
||||
_defs_sequencer_generic.blade,
|
||||
|
||||
Reference in New Issue
Block a user