diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-04-06 01:11:55 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-04-06 01:11:55 +0300 |
| commit | 0e7599bc15d85d59072a945dba50d2e8c09666a6 (patch) | |
| tree | a789fec7b613580f1a209b0f4bbb86df8d0f4ee2 /source/blender/editors/animation | |
| parent | 0d0036cb53f83597aa8a52edd0e19fd915f4ed65 (diff) | |
VSE: don't allow strip preview when clicking on the scrubbing region
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
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 7689d121a0c..2db381dfc69 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -49,6 +49,7 @@ #include "ED_anim_api.h" #include "ED_screen.h" #include "ED_sequencer.h" +#include "ED_time_scrub_ui.h" #include "ED_util.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); if (area && area->spacetype == SPACE_SEQ) { 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); } } |