From 0d678e71a833ef8a8055160f00b11121c9488fe1 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 5 Jan 2013 08:03:16 +0000 Subject: Fix #33674: Meta strip could overlap with other strips when exiting edit mode Not sure what's the best thing to do here, for now just added vertical shuffle of meta strip if it overlaps with other strips when existing edit mode. --- source/blender/editors/space_sequencer/sequencer_edit.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 892f0a3f489..c6c70ccb424 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1906,6 +1906,9 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) for (seq = ed->seqbasep->first; seq; seq = seq->next) BKE_sequence_calc(scene, seq); + if (BKE_sequence_test_overlap(ed->seqbasep, ms->parseq)) + BKE_sequence_base_shuffle(ed->seqbasep, ms->parseq, scene); + BKE_sequencer_active_set(scene, ms->parseq); ms->parseq->flag |= SELECT; -- cgit v1.2.3