Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-06-09 09:46:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-09 09:49:33 +0300
commit1355d9cc8cbc84e8153008c12cd09146f8c9d26c (patch)
tree84faeb7577159cbda09b80e23195237c405c7702 /source
parentf88d59ecf8e59aa8f5f4b0449a04122ea0c8acd0 (diff)
Sequencer: restore behavior removed from recent refactor
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_select.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index f2b7e138c3e..2686edd58a5 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -422,8 +422,19 @@ static int sequencer_select_exec(bContext *C, wmOperator *op)
}
SEQP_BEGIN (ed, seq) {
- /* Select left or right. */
- if ((x < CFRA && seq->enddisp <= CFRA) || (x > CFRA && seq->startdisp >= CFRA)) {
+ bool test = false;
+ /* FIXME(campbell): this functionality is only in the sequencer,
+ * either we should support this for all timeline views or remove it. */
+ if ((x == CFRA) && (seq->startdisp <= CFRA) && (seq->enddisp >= CFRA)) {
+ /* Select overlapping the current frame. */
+ test = true;
+ }
+ else if ((x < CFRA && seq->enddisp <= CFRA) || (x > CFRA && seq->startdisp >= CFRA)) {
+ /* Select left or right. */
+ test = true;
+ }
+
+ if (test) {
seq->flag |= SELECT;
recurs_sel_seq(seq);
}