From 24a3446787d31f9b32e6759f91349b598c8e9774 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Tue, 24 Aug 2021 00:46:34 +0200 Subject: Fix T90646: VSE hangs when strips overlap When all strips are selected and overlap is caused, this causes VSE to hang in infinite loop, because such situation should never happen. To prevent infinite loop, ensure, that strip overlap is not tested against single overlapping strip itself. Prevent overlap that can not be handled because of issue described above by moving overlapping strip between channels. Reviewed By: campbellbarton Differential Revision: D12209 --- source/blender/sequencer/SEQ_iterator.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/sequencer/SEQ_iterator.h') diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.h index cb2091511a9..3ade7309f89 100644 --- a/source/blender/sequencer/SEQ_iterator.h +++ b/source/blender/sequencer/SEQ_iterator.h @@ -73,6 +73,7 @@ struct Sequence *SEQ_iterator_yield(SeqIterator *iterator); SeqCollection *SEQ_collection_create(const char *name); SeqCollection *SEQ_collection_duplicate(SeqCollection *collection); uint SEQ_collection_len(const SeqCollection *collection); +bool SEQ_collection_has_strip(const struct Sequence *seq, const SeqCollection *collection); bool SEQ_collection_append_strip(struct Sequence *seq, SeqCollection *data); bool SEQ_collection_remove_strip(struct Sequence *seq, SeqCollection *data); void SEQ_collection_free(SeqCollection *collection); -- cgit v1.2.3