diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-05 12:03:16 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-05 12:03:16 +0400 |
| commit | 0d678e71a833ef8a8055160f00b11121c9488fe1 (patch) | |
| tree | fbd98c4e84fe60c858b06e840ffa1784d6c73cbf /source/blender/editors/space_sequencer | |
| parent | 93a6872a254f4507d07ffb17919a32e234715ce1 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |