diff options
author | Richard Antalik <richardantalik@gmail.com> | 2022-04-04 13:52:48 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2022-04-04 13:56:43 +0300 |
commit | 277fa2f441f4ab2c00e7f329ba34a3466956647c (patch) | |
tree | bde615d956239337f88575dc7ce79d26f0f6cf4f /release | |
parent | 5a0b4e97e67446ef3a180acb0ad03b4cbf91b356 (diff) |
VSE: Add channel headers
This patch adds channel region to VSE timeline area for drawing channel
headers. It is synchronizedwith timeline region. 3 basic features are
implemented - channel visibility, locking and name.
Channel data is stored in `SeqTimelineChannel` which can be top-level
owned by `Editing`, or it is owned by meta strip to support nesting.
Strip properties are completely independent and channel properties are
applied on top of particular strip property, thus overriding it.
Implementation is separate from channel regions in other editors. This
is mainly because style and topology is quite different in VSE. But
also code seems to be much more readable this way.
Currently channels use functions similar to VSE timeline to draw
background to provide illusion of transparency, but only for background
and sfra/efra regions.
Great portion of this patch is change from using strip visibility and
lock status to include channel state - this is facilitated by functions
`SEQ_transform_is_locked` and `SEQ_render_is_muted`
Originally this included changes in D14263, but patch was split for
easier review.
Reviewed By: fsiddi, Severin
Differential Revision: https://developer.blender.org/D13836
Diffstat (limited to 'release')
4 files changed, 39 insertions, 0 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 08f91781aa0..19798e3f165 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -665,6 +665,10 @@ const bTheme U_theme_default = { .row_alternate = RGBA(0xffffff05), .anim_preview_range = RGBA(0xa14d0066), .metadatatext = RGBA(0xffffffff), + .list = RGBA(0x18181800), + .list_title = RGBA(0xffffffff), + .list_text = RGBA(0xffffffff), + .list_text_hi = RGBA(0xffffffff), }, .space_image = { .back = RGBA(0x30303000), diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index d05e9f8b7f8..262d341e885 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2998,6 +2998,22 @@ def km_sequencerpreview(params): return keymap +def km_sequencer_channels(params): + items = [] + keymap = ( + "Sequencer Channels", + {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, + {"items": items}, + ) + + items.extend([ + # Rename. + ("sequencer.rename_channel", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None), + ("sequencer.rename_channel", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), + ]) + return keymap + + # ------------------------------------------------------------------------------ # Editor (Console) @@ -7844,6 +7860,7 @@ def generate_keymaps(params=None): km_sequencercommon(params), km_sequencer(params), km_sequencerpreview(params), + km_sequencer_channels(params), km_console(params), km_clip(params), km_clip_editor(params), 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 6661031552e..4c1b905ac05 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -1865,6 +1865,22 @@ def km_sequencerpreview(params): return keymap +def km_sequencer_channels(params): + items = [] + keymap = ( + "Sequencer Channels", + {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, + {"items": items}, + ) + + items.extend([ + # Rename. + ("sequencer.rename_channel", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None), + ("sequencer.rename_channel", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None), + ]) + return keymap + + def km_console(params): items = [] keymap = ( @@ -4090,6 +4106,7 @@ def generate_keymaps_impl(params=None): km_sequencercommon(params), km_sequencer(params), km_sequencerpreview(params), + km_sequencer_channels(params), km_console(params), km_clip(params), km_clip_editor(params), diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 96ac62fb502..56a63215dcb 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -418,6 +418,7 @@ class SEQUENCER_MT_view(Menu): if is_sequencer_view: layout.prop(st, "show_region_hud") + layout.prop(st, "show_region_channels") layout.separator() |