Commit: ecbbb02c8832d6e460bf21a4579fc28d7c18fd62
Author: Julian Eisel
Date: Mon Nov 30 14:12:31 2015 +0100
Branches: master
https://developer.blender.org/rBecbbb02c8832d6e460bf21a4579fc28d7c18fd62
Fix T46628: Strips overlapping in VSE
Caused by rB27b2ab8cf4ae (although patch D1096 was correct).
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index 6e722e7..7c42054 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
