[Bf-blender-cvs] [0e7599bc15d] master: VSE: don't allow strip preview when clicking on the scrubbing region

[Richard Antalik]

Commit: 0e7599bc15d85d59072a945dba50d2e8c09666a6
Author: Richard Antalik
Date:   Mon Apr 6 00:11:55 2020 +0200
Branches: master
https://developer.blender.org/rB0e7599bc15d85d59072a945dba50d2e8c09666a6

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

===================================================================

M	source/blender/editors/animation/anim_ops.c

===================================================================

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);
     }
   }