diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-06-06 04:03:01 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-06-06 04:05:45 +0300 |
commit | 54ce344bc7cc9a0e1c34b328081cb90e41aca7b9 (patch) | |
tree | 675d9e6e59075bee3f14ae1ea79dc5316a4b56bb /source/blender/editors | |
parent | dbfde0fe7038d465cb52e335472199babae6ee4d (diff) |
VSE: Remove seq->tmp usage from transform code
This field was used for extend feature to get handle position of
metastrip children. Since D9972 extend feature works only on meta
strip itself, not it's children.
So `SEQ_transform_get_left_handle_frame()` second argument is always
false and can be removed.
Another instance of `seq->tmp usage` is hack to distinguish strips to be
shuffled, which is not covered by this patch.
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D10321
Diffstat (limited to 'source/blender/editors')
3 files changed, 9 insertions, 14 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index b55c8035fa3..7f500597906 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -870,9 +870,9 @@ static void draw_seq_background(Scene *scene, /* Draw the main strip body. */ if (is_single_image) { immRectf(pos, - SEQ_transform_get_left_handle_frame(seq, false), + SEQ_transform_get_left_handle_frame(seq), y1, - SEQ_transform_get_right_handle_frame(seq, false), + SEQ_transform_get_right_handle_frame(seq), y2); } else { diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index f22a515a8f2..a047659e1e9 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1776,8 +1776,8 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) /* if (seq->ipo) id_us_min(&seq->ipo->id); */ /* XXX, remove fcurve and assign to split image strips */ - start_ofs = timeline_frame = SEQ_transform_get_left_handle_frame(seq, false); - frame_end = SEQ_transform_get_right_handle_frame(seq, false); + start_ofs = timeline_frame = SEQ_transform_get_left_handle_frame(seq); + frame_end = SEQ_transform_get_right_handle_frame(seq); while (timeline_frame < frame_end) { /* New seq. */ diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index 34be89e5ed9..279fcdffc1f 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -90,8 +90,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *r_recursive, int *r_c Scene *scene = t->scene; int cfra = CFRA; - int left = SEQ_transform_get_left_handle_frame(seq, false); - int right = SEQ_transform_get_right_handle_frame(seq, false); + int left = SEQ_transform_get_left_handle_frame(seq); + int right = SEQ_transform_get_right_handle_frame(seq); if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) { *r_recursive = false; @@ -180,11 +180,6 @@ static int SeqTransCount(TransInfo *t, Sequence *parent, ListBase *seqbase, int for (seq = seqbase->first; seq; seq = seq->next) { seq->depth = depth; - /* 'seq->tmp' is used by seq_tx_get_final_{left, right} - * to check sequence's range and clamp to it if needed. - * It's first place where digging into sequences tree, so store link to parent here. */ - seq->tmp = parent; - SeqTransInfo(t, seq, &recursive, &count, &flag); /* ignore the flag */ tot += count; @@ -206,16 +201,16 @@ static TransData *SeqToTransData( /* Use seq_tx_get_final_left() and an offset here * so transform has the left hand location of the strip. * tdsq->start_offset is used when flushing the tx data back */ - start_left = SEQ_transform_get_left_handle_frame(seq, false); + start_left = SEQ_transform_get_left_handle_frame(seq); td2d->loc[0] = start_left; tdsq->start_offset = start_left - seq->start; /* use to apply the original location */ break; case SEQ_LEFTSEL: - start_left = SEQ_transform_get_left_handle_frame(seq, false); + start_left = SEQ_transform_get_left_handle_frame(seq); td2d->loc[0] = start_left; break; case SEQ_RIGHTSEL: - td2d->loc[0] = SEQ_transform_get_right_handle_frame(seq, false); + td2d->loc[0] = SEQ_transform_get_right_handle_frame(seq); break; } |