[Bf-blender-cvs] [13df8616ce6] master: VSE: Fix 2D cursor not visible
Richard Antalik
noreply at git.blender.org
Sat Oct 9 08:43:30 CEST 2021
Commit: 13df8616ce64a883aa9d44283ca0bfcb2c5c3d13
Author: Richard Antalik
Date: Sat Oct 9 08:32:07 2021 +0200
Branches: master
https://developer.blender.org/rB13df8616ce64a883aa9d44283ca0bfcb2c5c3d13
VSE: Fix 2D cursor not visible
This was caused by confusing naming of frame overlay feature.
Correct flag to use is `sseq->flag & SEQ_SHOW_OVERLAY`, not
`ed->over_flag & SEQ_EDIT_OVERLAY_SHOW`.
===================================================================
M source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 87344a38c26..25a08abdabc 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -781,15 +781,16 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *region)
SpaceSeq *sseq = area->spacedata.first;
Scene *scene = CTX_data_scene(C);
wmWindowManager *wm = CTX_wm_manager(C);
- const bool draw_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) &&
- (sseq->flag & SEQ_SHOW_OVERLAY));
+ const bool draw_overlay = sseq->flag & SEQ_SHOW_OVERLAY;
+ const bool draw_frame_overlay = (scene->ed && (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) &&
+ draw_overlay);
const bool is_playing = ED_screen_animation_playing(wm);
- if (!draw_overlay || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) {
+ if (!draw_frame_overlay || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) {
sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, false);
}
- if (draw_overlay && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) {
+ if (draw_frame_overlay && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) {
int over_cfra;
if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) {
More information about the Bf-blender-cvs
mailing list