blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

VSE: rename flag for Frame Overlay feature 

Rename `SEQ_EDIT_OVERLAY_SHOW` to `SEQ_EDIT_USE_FRAME_OVERLAY` to avoid
confusion between `SEQ_SHOW_OVERLAY` of `SpaceSeq.flag`
This commit is contained in:
Richard Antalik 2021-10-09 08:37:14 +02:00
parent 13df8616ce
commit 27ac80f068
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_sequencer/sequencer_buttons.c
View File

@ -78,7 +78,7 @@ 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_OVERLAY_SHOW) &&
const bool show_split = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) &&
(space_sequencer->mainb == SEQ_DRAW_IMG_IMBUF));
if (show_split && space_sequencer->overlay_type == SEQ_DRAW_OVERLAY_REFERENCE) {
return;

2
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -2807,7 +2807,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_OVERLAY_SHOW) {
if (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) {
draw_overlap_frame_indicator(scene, v2d);
}
UI_view2d_view_restore(C);

2
source/blender/editors/space_sequencer/space_sequencer.c
View File

@ -782,7 +782,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region)
Scene *scene = CTX_data_scene(C);
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_OVERLAY_SHOW) &&
const bool draw_frame_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_USE_FRAME_OVERLAY) &&
draw_overlay);
const bool is_playing = ED_screen_animation_playing(wm);

2
source/blender/makesdna/DNA_sequence_types.h
View File

@ -503,7 +503,7 @@ typedef struct SequencerScopes {
#define SELECT 1
/* Editor->over_flag */
#define SEQ_EDIT_OVERLAY_SHOW 1
#define SEQ_EDIT_USE_FRAME_OVERLAY 1
#define SEQ_EDIT_OVERLAY_ABS 2
#define SEQ_STRIP_OFSBOTTOM 0.05f

2
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -2114,7 +2114,7 @@ static void rna_def_editor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Active Strip", "Sequencer's active strip");
prop = RNA_def_property(srna, "show_overlay", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "over_flag", SEQ_EDIT_OVERLAY_SHOW);
RNA_def_property_boolean_sdna(prop, NULL, "over_flag", SEQ_EDIT_USE_FRAME_OVERLAY);
RNA_def_property_ui_text(
prop, "Show Overlay", "Partial overlay on top of the sequencer with a frame offset");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);