[Bf-blender-cvs] [1355d9cc8cb] master: Sequencer: restore behavior removed from recent refactor
Campbell Barton
noreply at git.blender.org
Tue Jun 9 08:50:10 CEST 2020
Commit: 1355d9cc8cbc84e8153008c12cd09146f8c9d26c
Author: Campbell Barton
Date: Tue Jun 9 16:46:39 2020 +1000
Branches: master
https://developer.blender.org/rB1355d9cc8cbc84e8153008c12cd09146f8c9d26c
Sequencer: restore behavior removed from recent refactor
===================================================================
M source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
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);
}
More information about the Bf-blender-cvs
mailing list