1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VSE: don't allow strip preview when clicking on the scrubbing region

Browse Source 
Don't set 'special preview' or Solo mode if scrubbing in scrubbing region.

Author: a.monti

Reviewed By: Severin

Differential Revision: https://developer.blender.org/D7234
This commit is contained in:
Richard Antalik 2020-04-06 00:11:55 +02:00
parent 0d0036cb53
commit 0e7599bc15
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/animation/anim_ops.c
View File

@ -49,6 +49,7 @@
#include "ED_anim_api.h" #include "ED_anim_api.h"
#include "ED_screen.h" #include "ED_screen.h"
#include "ED_sequencer.h" #include "ED_sequencer.h"
#include "ED_time_scrub_ui.h"
#include "ED_util.h" #include "ED_util.h"
#include "DEG_depsgraph.h" #include "DEG_depsgraph.h"
@ -155,7 +156,9 @@ static void change_frame_seq_preview_begin(bContext *C, const wmEvent *event)
bScreen *screen = CTX_wm_screen(C); bScreen *screen = CTX_wm_screen(C);
if (area && area->spacetype == SPACE_SEQ) { if (area && area->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = area->spacedata.first; SpaceSeq *sseq = area->spacedata.first;
if (ED_space_sequencer_check_show_strip(sseq)) { ARegion *region = CTX_wm_region(C);
if (ED_space_sequencer_check_show_strip(sseq) &&
!ED_time_scrub_event_in_region(region, event)) {
ED_sequencer_special_preview_set(C, event->mval); ED_sequencer_special_preview_set(C, event->mval);
} }
} }