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/sequencer/intern | |
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/sequencer/intern')
-rw-r--r-- | source/blender/sequencer/intern/strip_transform.c | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c index 3a0ba36b795..a02d8a1428e 100644 --- a/source/blender/sequencer/intern/strip_transform.c +++ b/source/blender/sequencer/intern/strip_transform.c @@ -48,24 +48,12 @@ static int seq_tx_get_end(Sequence *seq) return seq->start + seq->len; } -int SEQ_transform_get_left_handle_frame(Sequence *seq, bool metaclip) +int SEQ_transform_get_left_handle_frame(Sequence *seq) { - if (metaclip && seq->tmp) { - /* return the range clipped by the parents range */ - return max_ii(SEQ_transform_get_left_handle_frame(seq, false), - SEQ_transform_get_left_handle_frame((Sequence *)seq->tmp, true)); - } - return (seq->start - seq->startstill) + seq->startofs; } -int SEQ_transform_get_right_handle_frame(Sequence *seq, bool metaclip) +int SEQ_transform_get_right_handle_frame(Sequence *seq) { - if (metaclip && seq->tmp) { - /* return the range clipped by the parents range */ - return min_ii(SEQ_transform_get_right_handle_frame(seq, false), - SEQ_transform_get_right_handle_frame((Sequence *)seq->tmp, true)); - } - return ((seq->start + seq->len) + seq->endstill) - seq->endofs; } @@ -151,14 +139,12 @@ bool SEQ_transform_seqbase_isolated_sel_check(ListBase *seqbase) void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { if (leftflag) { - if (SEQ_transform_get_left_handle_frame(seq, false) >= - SEQ_transform_get_right_handle_frame(seq, false)) { - SEQ_transform_set_left_handle_frame(seq, - SEQ_transform_get_right_handle_frame(seq, false) - 1); + if (SEQ_transform_get_left_handle_frame(seq) >= SEQ_transform_get_right_handle_frame(seq)) { + SEQ_transform_set_left_handle_frame(seq, SEQ_transform_get_right_handle_frame(seq) - 1); } if (SEQ_transform_single_image_check(seq) == 0) { - if (SEQ_transform_get_left_handle_frame(seq, false) >= seq_tx_get_end(seq)) { + if (SEQ_transform_get_left_handle_frame(seq) >= seq_tx_get_end(seq)) { SEQ_transform_set_left_handle_frame(seq, seq_tx_get_end(seq) - 1); } @@ -175,14 +161,12 @@ void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) } if (rightflag) { - if (SEQ_transform_get_right_handle_frame(seq, false) <= - SEQ_transform_get_left_handle_frame(seq, false)) { - SEQ_transform_set_right_handle_frame(seq, - SEQ_transform_get_left_handle_frame(seq, false) + 1); + if (SEQ_transform_get_right_handle_frame(seq) <= SEQ_transform_get_left_handle_frame(seq)) { + SEQ_transform_set_right_handle_frame(seq, SEQ_transform_get_left_handle_frame(seq) + 1); } if (SEQ_transform_single_image_check(seq) == 0) { - if (SEQ_transform_get_right_handle_frame(seq, false) <= seq_tx_get_start(seq)) { + if (SEQ_transform_get_right_handle_frame(seq) <= seq_tx_get_start(seq)) { SEQ_transform_set_right_handle_frame(seq, seq_tx_get_start(seq) + 1); } } @@ -204,14 +188,12 @@ void SEQ_transform_fix_single_image_seq_offsets(Sequence *seq) /* make sure the image is always at the start since there is only one, * adjusting its start should be ok */ - left = SEQ_transform_get_left_handle_frame(seq, false); + left = SEQ_transform_get_left_handle_frame(seq); start = seq->start; if (start != left) { offset = left - start; - SEQ_transform_set_left_handle_frame(seq, - SEQ_transform_get_left_handle_frame(seq, false) - offset); - SEQ_transform_set_right_handle_frame( - seq, SEQ_transform_get_right_handle_frame(seq, false) - offset); + SEQ_transform_set_left_handle_frame(seq, SEQ_transform_get_left_handle_frame(seq) - offset); + SEQ_transform_set_right_handle_frame(seq, SEQ_transform_get_right_handle_frame(seq) - offset); seq->start += offset; } } |