[Bf-blender-cvs] [277fa2f441f] master: VSE: Add channel headers
Richard Antalik
noreply at git.blender.org
Mon Apr 4 13:06:46 CEST 2022
Commit: 277fa2f441f4ab2c00e7f329ba34a3466956647c
Author: Richard Antalik
Date: Mon Apr 4 12:52:48 2022 +0200
Branches: master
https://developer.blender.org/rB277fa2f441f4ab2c00e7f329ba34a3466956647c
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
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/intern/scene.cc
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/versioning_common.cc
M source/blender/blenloader/intern/versioning_common.h
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_sequencer/CMakeLists.txt
A source/blender/editors/space_sequencer/sequencer_channels_draw.c
A source/blender/editors/space_sequencer/sequencer_channels_edit.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_ops.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_convert_sequencer_image.c
M source/blender/editors/transform/transform_gizmo_2d.c
M source/blender/editors/transform/transform_snap_sequencer.c
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/sequencer/CMakeLists.txt
A source/blender/sequencer/SEQ_channels.h
M source/blender/sequencer/SEQ_iterator.h
M source/blender/sequencer/SEQ_render.h
M source/blender/sequencer/SEQ_transform.h
A source/blender/sequencer/intern/channels.c
M source/blender/sequencer/intern/effects.c
M source/blender/sequencer/intern/iterator.c
M source/blender/sequencer/intern/prefetch.c
M source/blender/sequencer/intern/render.c
M source/blender/sequencer/intern/render.h
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/strip_edit.c
M source/blender/sequencer/intern/strip_time.c
M source/blender/sequencer/intern/strip_transform.c
M source/blender/sequencer/intern/utils.c
===================================================================
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()
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 604c8cb7a06..1f3b0606dfd 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -25,7 +25,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 8
+#define BLENDER_FILE_SUBVERSION 9
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index 685d24cee38..cc1204abbfb 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -321,6 +321,7 @@ static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int
&scene_src->ed->seqbase,
SEQ_DUPE_ALL,
flag_subdata);
+ BLI_duplicatelist(&scene_dst->ed->channels, &scene_src->ed->channels);
}
if ((flag & LIB_ID_COPY_NO_PREVIEW) == 0) {
@@ -990,6 +991,9 @@ static void scene_blend_write(BlendWriter *writer, ID *id, const void *id_addres
BLO_write_struct(writer, Editing, ed);
SEQ_blend_write(writer, &ed->seqbase);
+ LISTBASE_FOREACH (SeqTimelineChannel *, channel, &ed->channels) {
+ BLO_write_struct(writer, SeqTimelineChannel, channel);
+ }
/* new; meta stack too, even when its nasty restore code */
LISTBASE_FOREACH (MetaStack *, ms, &ed->metastack) {
BLO_write_struct(writer, MetaStack, ms);
@@ -1174,6 +1178,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
if (sce->ed) {
ListBase *old_seqbasep = &sce->ed->seqbase;
+ ListBase *old_displayed_channels = &sce->ed->channels;
BLO_read_data_address(reader, &sce->ed);
Editing *ed = sce->ed;
@@ -1188,32 +1193,53 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
/* Read in sequence member data. */
SEQ_blend_read(reader, &ed->seqbase);
+ BLO_read_list(reader, &ed->channels);
/* link metastack, slight abuse of structs here,
* have to restore pointer to internal part in struct */
{
Sequence temp;
- void *poin;
- intptr_t offset;
+ void *seqbase_poin;
+ void *channels_poin;
+ intptr_t seqbase_offset;
+ intptr_t channels_offset;
- offset = ((intptr_t) & (temp.seqbase)) - ((intptr_t)&temp);
+ seqbase_offset = ((intptr_t) & (temp.seqbase)) - ((intptr_t)&temp);
+ channels_offset = ((intptr_t) & (temp.channels)) - ((intptr_t)&temp);
- /* root pointer */
+ /* seqbase root pointer */
if (ed->seqbasep == old_seqbasep) {
ed->seqbasep = &ed->seqbase;
}
else {
- poin = POINTER_OFFSET(ed->seqbasep, -offset);
+ seqbase_poin = POINTER_OFFSET(ed->seqbasep, -seqbase_offset);
- poin = BLO_read_get_new_data_address(reader, poin);
+ seqbase_poin = BLO_read_get_new_data_address(reader, seqbase_poin);
- if (poin) {
- ed->seqbasep = (ListBase *)POINTER_OFFSET(poin, offset);
+ if (seqbase_poin) {
+ ed->seqbasep = (ListBase *)POINTER_OFFSET(seqbase_poin, seqbase_offset);
}
else {
ed->seqbasep = &ed->seqbase;
}
}
+
+ /* Active channels root pointer. */
+ if (ed->displayed_channels == old_displayed_channels || ed->displayed_channels == NULL) {
+ ed->displayed_channels = &ed->channels;
+ }
+ else {
+ channels_poin = POINTER_OFFSET(ed->displayed_channels, -channels_offset);
+ channels_poin = BLO_read_get_new_data_address(reader, channels_poin);
+
+ if (channels_poin) {
+ ed->displayed_channels = (ListBase *)POINTER_OFFSET(channels_poin, channels_offset);
+ }
+ else {
+ ed->displayed_channels = &ed->channels;
+ }
+ }
+
/* stack */
BLO_read_list(reader, &(ed->metastack));
@@ -1224,15 +1250,30 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
ms->oldbasep = &ed->seqbase;
}
else {
- poin = POINTER_OFFSET(ms->oldbasep, -offset);
- poin = BLO_read_get_new_data_address(reader, poin);
- if (poin) {
- ms->oldbasep = (ListBase *)POINTER_OFFSET(poin, offset);
+ seqbase_poin = POINTER_OFFSET(ms->oldbasep, -seqbase_offset);
+ seqbase_poin = BLO_read_get_new_data_address(reader, seqbase_poin);
+ if (seqbase_poin) {
+ ms->oldbasep = (ListBase *)POINTER_OFFSET(seqbase_poin, seqbase_offset);
}
else {
ms->oldbasep = &ed->seqbase;
}
}
+
+ if (ms->old_channels == old_displayed_channels || ms->old_channels == NULL) {
+ ms->old_channels = &ed->channels;
+ }
+ else {
+ channels_poin = POINTER_OFFSET(ms->old_channels, -channels_offset);
+ channels_poin = BLO_read_get_new_data_address(reader, channels_poin);
+
+ if (channels_poin) {
+ ms->old_channels = (ListBase *)POINTER_OFFSET(channels_poin, channels_offset);
+ }
+ else {
+ ms->old_channels = &ed->channels;
+ }
+ }
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index b1c982649d2..0996b35c8ea 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -637,13 +637,6 @@ static ARegion *do_versions_find_region(ListBase *regionbase, int regiontype)
return region;
}
-static ARegion *do_versions_add_region(int regiontype, const char *name)
-{
- ARegion *region = MEM_callocN(sizeof(ARegion), name);
- region->regiontype = regiontype;
- return region;
-}
-
static void do_versions_area_ensure_tool_region(Main *bmain,
const short space_type,
const short region_flag)
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index eee0e7fbea8..d2b8c4330bc 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -53,6 +53,7 @@
#include "BKE_main.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list