diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-06-17 04:40:44 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-06-17 04:42:04 +0300 |
| commit | e7003bc9654b217e5938d64fb40094035735de9b (patch) | |
| tree | 632657a701424d1c5f9bdfd835daffe7d0723796 /source/blender/editors/space_sequencer | |
| parent | c73be23e176272da78b38f733fd56af09ebd7acf (diff) | |
VSE: Reduce transform code complexity
Reduce complexity of sequencer transform code by removing recursivity.
This is possible by treating meta strips (mostly) as any other strip and
containing all transform code within SEQ_ functions.
Unfortunately internally meta strips still require special treatment,
but all complexity from code all over transform code seems to be
possible to contain within one function.
Functional change:
Previously adjusting handle of single image strip moved animation.
Now animation is not moved, which is behavior for all other strips.
Reviewed By: sergey, mano-wii
Differential Revision: https://developer.blender.org/D11493
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 5f831cbf535..b6929f12cc0 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -367,8 +367,6 @@ static void draw_seq_waveform_overlay(View2D *v2d, static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, float x2, float y2) { - /* Don't use SEQ_ALL_BEGIN/SEQ_ALL_END here, - * because it changes seq->depth, which is needed for transform. */ Sequence *seq; uchar col[4]; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 42e2a2e5549..4c8b44864f9 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -335,7 +335,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) /* Check meta-strips. */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { - if (seq->flag & SELECT && !(seq->depth == 0 && seq->flag & SEQ_LOCK) && + if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK) && SEQ_transform_sequence_can_be_translated(seq)) { if ((seq->flag & (SEQ_LEFTSEL + SEQ_RIGHTSEL)) == 0) { SEQ_transform_translate_sequence( @@ -357,7 +357,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) /* Test for effects and overlap. */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { - if (seq->flag & SELECT && !(seq->depth == 0 && seq->flag & SEQ_LOCK)) { + if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; if (SEQ_transform_test_overlap(ed->seqbasep, seq)) { SEQ_transform_seqbase_shuffle(ed->seqbasep, seq, scene); @@ -2187,7 +2187,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i seq = ed->seqbasep->first; while (seq) { - if ((seq != test) && (test->machine == seq->machine) && (test->depth == seq->depth) && + if ((seq != test) && (test->machine == seq->machine) && ((sel == -1) || (sel == (seq->flag & SELECT)))) { dist = MAXFRAME * 2; |