archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T46628: Strips overlapping in VSE

Browse Source 
Caused by rB27b2ab8cf4ae (although patch D1096 was correct).
This commit is contained in:
Julian Eisel
2015-11-30 14:12:31 +01:00
parent faa0fdb13e
commit ecbbb02c88
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/sequencer.c
View File

@@ -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;
}