griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T45464: Blender Sequencer "Select Strips to the Left" produces opposite behavior to what is intended.

Browse Source 
Logic was just broken for the LEFT case here.

Also cleaned up and made behavior more consistant between strips and markers.
This commit is contained in:
Bastien Montagne
2015-07-17 18:31:48 +02:00
parent 3a15ec337e
commit 20de6f01ed
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/space_sequencer/sequencer_select.c
View File

@@ -358,36 +358,32 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e
x = UI_view2d_region_to_view_x(v2d, event->mval[0]);
break;
case SEQ_SELECT_LR_LEFT:
x = CFRA - 1.0f;
break;
case SEQ_SELECT_LR_RIGHT:
default:
x = CFRA;
break;
}
SEQP_BEGIN (ed, seq)
{
if (x < CFRA) {
if (seq->enddisp <= CFRA) {
seq->flag |= SELECT;
recurs_sel_seq(seq);
}
}
else {
if (seq->startdisp >= CFRA) {
seq->flag |= SELECT;
recurs_sel_seq(seq);
}
if (((x < CFRA) && (seq->enddisp <= CFRA)) ||
((x >= CFRA) && (seq->startdisp >= CFRA)))
{
seq->flag |= SELECT;
recurs_sel_seq(seq);
}
}
SEQ_END
{
SpaceSeq *sseq = CTX_wm_space_seq(C);
if (sseq && sseq->flag & SEQ_MARKER_TRANS) {
TimeMarker *tmarker;
for (tmarker = scene->markers.first; tmarker; tmarker = tmarker->next) {
if (((x < CFRA) && tmarker->frame < CFRA) ||
((x >= CFRA) && tmarker->frame >= CFRA))
if (((x < CFRA) && (tmarker->frame <= CFRA)) ||
((x >= CFRA) && (tmarker->frame >= CFRA)))
{
tmarker->flag |= SELECT;
}