[Bf-blender-cvs] [e538b2c3a38] master: Cleanup: internal sequencer naming for overlays
Campbell Barton
noreply at git.blender.org
Mon Oct 18 06:48:44 CEST 2021
Commit: e538b2c3a38f130787ca604b0e0182a74e9d6976
Author: Campbell Barton
Date: Mon Oct 18 15:47:28 2021 +1100
Branches: master
https://developer.blender.org/rBe538b2c3a38f130787ca604b0e0182a74e9d6976
Cleanup: internal sequencer naming for overlays
- Rename RNA SpaceSeq.show_strip_overlay to show_overlays
matching the 3D View, the term "strip" was misleading as this is used
for the preview as well.
- Rename various RNA overlay settings to overlay_frame
since "Frame Offset" is a specific feature, avoid having both
Editor.show_overlay and SpaceSeq.show_overlays.
- Rename Editing `over_*` -> `overlay_frame_*` in DNA,
as well as flags.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/editors/space_sequencer/sequencer_buttons.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 07f4a40e118..1e25b33cc20 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2684,7 +2684,7 @@ def km_sequencercommon(params):
sidebar_key={"type": 'N', "value": 'PRESS'},
),
("wm.context_toggle", {"type": 'O', "value": 'PRESS', "shift": True},
- {"properties": [("data_path", 'scene.sequence_editor.show_overlay')]}),
+ {"properties": [("data_path", 'scene.sequence_editor.show_overlay_frame')]}),
("wm.context_toggle_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
{"properties": [("data_path", 'space_data.view_type'), ("value_1", 'SEQUENCER'), ("value_2", 'PREVIEW')]}),
("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None),
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index bbb962e6611..01c33db2ddc 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -215,10 +215,10 @@ class SEQUENCER_HT_header(Header):
)
row = layout.row(align=True)
- row.prop(st, "show_strip_overlay", text="", icon='OVERLAY')
+ row.prop(st, "show_overlays", text="", icon='OVERLAY')
sub = row.row(align=True)
sub.popover(panel="SEQUENCER_PT_overlay", text="")
- sub.active = st.show_strip_overlay
+ sub.active = st.show_overlays
class SEQUENCER_MT_editor_menus(Menu):
@@ -289,9 +289,9 @@ class SEQUENCER_PT_preview_overlay(Panel):
overlay_settings = st.preview_overlay
layout = self.layout
- layout.active = st.show_strip_overlay
+ layout.active = st.show_overlays
layout.prop(overlay_settings, "show_image_outline")
- layout.prop(ed, "show_overlay", text="Frame Overlay")
+ layout.prop(ed, "show_overlay_frame", text="Frame Overlay")
layout.prop(overlay_settings, "show_safe_areas", text="Safe Areas")
layout.prop(overlay_settings, "show_metadata", text="Metadata")
layout.prop(overlay_settings, "show_annotation", text="Annotations")
@@ -313,7 +313,7 @@ class SEQUENCER_PT_sequencer_overlay(Panel):
overlay_settings = st.timeline_overlay
layout = self.layout
- layout.active = st.show_strip_overlay
+ layout.active = st.show_overlays
layout.prop(overlay_settings, "show_strip_name", text="Name")
layout.prop(overlay_settings, "show_strip_source", text="Source")
@@ -2265,7 +2265,7 @@ class SEQUENCER_PT_frame_overlay(SequencerButtonsPanel_Output, Panel):
scene = context.scene
ed = scene.sequence_editor
- self.layout.prop(ed, "show_overlay", text="")
+ self.layout.prop(ed, "show_overlay_frame", text="")
def draw(self, context):
layout = self.layout
@@ -2281,12 +2281,12 @@ class SEQUENCER_PT_frame_overlay(SequencerButtonsPanel_Output, Panel):
scene = context.scene
ed = scene.sequence_editor
- layout.active = ed.show_overlay
+ layout.active = ed.show_overlay_frame
col = layout.column()
col.prop(ed, "overlay_frame", text="Frame Offset")
- col.prop(st, "overlay_type")
- col.prop(ed, "use_overlay_lock")
+ col.prop(st, "overlay_frame_type")
+ col.prop(ed, "use_overlay_frame_lock")
class SEQUENCER_PT_view_safe_areas(SequencerButtonsPanel_Output, Panel):
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c
index f0940cd9f55..4ece7f6a481 100644
--- a/source/blender/editors/space_sequencer/sequencer_buttons.c
+++ b/source/blender/editors/space_sequencer/sequencer_buttons.c
@@ -78,9 +78,10 @@ static void metadata_panel_context_draw(const bContext *C, Panel *panel)
SpaceSeq *space_sequencer = CTX_wm_space_seq(C);
/* NOTE: We can only reliably show metadata for the original (current)
* frame when split view is used. */
- const bool show_split = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) &&
+ const bool show_split = (scene->ed &&
+ (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_SHOW) &&
(space_sequencer->mainb == SEQ_DRAW_IMG_IMBUF));
- if (show_split && space_sequencer->overlay_type == SEQ_DRAW_OVERLAY_REFERENCE) {
+ if (show_split && (space_sequencer->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_REFERENCE)) {
return;
}
/* NOTE: We disable multiview for drawing, since we don't know what is the
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 922b6b251ed..7117323c214 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1862,15 +1862,15 @@ static void sequencer_preview_get_rect(rctf *preview,
sequencer_display_size(scene, viewrect);
BLI_rctf_init(preview, -1.0f, 1.0f, -1.0f, 1.0f);
- if (draw_overlay && sseq->overlay_type == SEQ_DRAW_OVERLAY_RECT) {
+ if (draw_overlay && (sseq->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_RECT)) {
preview->xmax = v2d->tot.xmin +
- (fabsf(BLI_rctf_size_x(&v2d->tot)) * scene->ed->over_border.xmax);
+ (fabsf(BLI_rctf_size_x(&v2d->tot)) * scene->ed->overlay_frame_rect.xmax);
preview->xmin = v2d->tot.xmin +
- (fabsf(BLI_rctf_size_x(&v2d->tot)) * scene->ed->over_border.xmin);
+ (fabsf(BLI_rctf_size_x(&v2d->tot)) * scene->ed->overlay_frame_rect.xmin);
preview->ymax = v2d->tot.ymin +
- (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->over_border.ymax);
+ (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->overlay_frame_rect.ymax);
preview->ymin = v2d->tot.ymin +
- (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->over_border.ymin);
+ (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->overlay_frame_rect.ymin);
}
else if (draw_backdrop) {
float aspect = BLI_rcti_size_x(®ion->winrct) / (float)BLI_rcti_size_y(®ion->winrct);
@@ -1958,8 +1958,8 @@ static void sequencer_draw_display_buffer(const bContext *C,
rctf canvas;
sequencer_preview_get_rect(&preview, scene, region, sseq, draw_overlay, draw_backdrop);
- if (draw_overlay && sseq->overlay_type == SEQ_DRAW_OVERLAY_RECT) {
- canvas = scene->ed->over_border;
+ if (draw_overlay && (sseq->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_RECT)) {
+ canvas = scene->ed->overlay_frame_rect;
}
else {
BLI_rctf_init(&canvas, 0.0f, 1.0f, 0.0f, 1.0f);
@@ -2207,7 +2207,8 @@ void sequencer_draw_preview(const bContext *C,
UI_view2d_view_ortho(v2d);
/* Draw background. */
- if (!draw_backdrop && (!draw_overlay || sseq->overlay_type == SEQ_DRAW_OVERLAY_REFERENCE)) {
+ if (!draw_backdrop &&
+ (!draw_overlay || (sseq->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_REFERENCE))) {
sequencer_preview_clear();
if (sseq->flag & SEQ_USE_ALPHA) {
@@ -2685,9 +2686,9 @@ static void draw_cache_view(const bContext *C)
/* Draw sequencer timeline. */
static void draw_overlap_frame_indicator(const struct Scene *scene, const View2D *v2d)
{
- int overlap_frame = (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ?
- scene->ed->over_cfra :
- scene->r.cfra + scene->ed->over_ofs;
+ int overlap_frame = (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_ABS) ?
+ scene->ed->overlay_frame_abs :
+ scene->r.cfra + scene->ed->overlay_frame_ofs;
uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
@@ -2807,7 +2808,7 @@ void draw_timeline_seq_display(const bContext *C, ARegion *region)
if (scene->ed != NULL) {
UI_view2d_view_ortho(v2d);
draw_cache_view(C);
- if (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) {
+ if (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_SHOW) {
draw_overlap_frame_indicator(scene, v2d);
}
UI_view2d_view_restore(C);
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index 981f793c896..79593b0bbb0 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -380,7 +380,7 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op)
CLAMP(rect.xmax, 0.0f, 1.0f);
CLAMP(rect.ymax, 0.0f, 1.0f);
- scene->ed->over_border = rect;
+ scene->ed->overlay_frame_rect = rect;
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 3ed8b35c9bf..c876bf7d483 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -783,25 +783,26 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region)
wmWindowManager *wm = CTX_wm_manager(C);
const bool draw_overlay = sseq->flag & SEQ_SHOW_OVERLAY;
const bool draw_frame_overlay = (scene->ed &&
- (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) &&
+ (scene->ed->overlay_frame_flag & SEQ_EDIT_OVERLAY_FRAME_SHOW) &&
draw_overlay);
const bool is_playing = ED_screen_animation_playing(wm);
- if (!draw_frame_overlay || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) {
+ if (!(draw_frame_overlay && (sseq->overlay_frame_type == SEQ_OVERLAY_FRAME_TYPE_REFERENCE))) {
sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, false);
}
- if (d
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list