diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-11-30 16:12:31 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-11-30 16:15:04 +0300 |
| commit | ecbbb02c8832d6e460bf21a4579fc28d7c18fd62 (patch) | |
| tree | 42541b0ce21c6206eba49c22b897134a22917787 /source | |
| parent | faa0fdb13eaea2fcbbaa673fe3fc337315e2632c (diff) | |
Fix T46628: Strips overlapping in VSE
Caused by rB27b2ab8cf4ae (although patch D1096 was correct).
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 6e722e7bc63..7c420549a0d 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -4419,7 +4419,7 @@ bool BKE_sequence_base_shuffle_ex(ListBase *seqbasep, Sequence *test, Scene *evi test->machine += channel_delta; BKE_sequence_calc(evil_scene, test); while (BKE_sequence_test_overlap(seqbasep, test)) { - if ((channel_delta > 0) ? (test->machine >= MAXSEQ) : (test->machine <= 1)) { + if ((channel_delta > 0) ? (test->machine >= MAXSEQ) : (test->machine < 1)) { break; } |