diff options
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_select.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 96a1776d763..a6b2d7feae3 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -33,13 +33,14 @@ #include "BKE_context.h" #include "BKE_report.h" -#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" #include "RNA_define.h" +#include "SEQ_sequencer.h" + /* For menu, popup, icons, etc. */ #include "ED_outliner.h" @@ -182,7 +183,7 @@ static void select_linked_time(ListBase *seqbase, Sequence *seq_link) } } -#if 0 // BRING BACK +#if 0 /* BRING BACK */ void select_surround_from_last(Scene *scene) { Sequence *seq = get_last_seq(scene); @@ -205,7 +206,7 @@ void ED_sequencer_select_sequence_single(Scene *scene, Sequence *seq, bool desel BKE_sequencer_active_set(scene, seq); - if ((seq->type == SEQ_TYPE_IMAGE) || (seq->type == SEQ_TYPE_MOVIE)) { + if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_MOVIE)) { if (seq->strip) { BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR); } @@ -465,7 +466,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) BKE_sequencer_active_set(scene, seq); - if ((seq->type == SEQ_TYPE_IMAGE) || (seq->type == SEQ_TYPE_MOVIE)) { + if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_MOVIE)) { if (seq->strip) { BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR); } @@ -974,18 +975,18 @@ static int sequencer_select_side_of_frame_exec(bContext *C, wmOperator *op) if (extend == false) { ED_sequencer_deselect_all(scene); } - const int cfra = CFRA; + const int timeline_frame = CFRA; SEQ_CURRENT_BEGIN (ed, seq) { bool test = false; switch (side) { case -1: - test = (cfra >= seq->startdisp); + test = (timeline_frame >= seq->enddisp); break; case 1: - test = (cfra <= seq->enddisp); + test = (timeline_frame <= seq->startdisp); break; case 0: - test = (cfra <= seq->enddisp) && (cfra >= seq->startdisp); + test = (timeline_frame <= seq->enddisp) && (timeline_frame >= seq->startdisp); break; } |