diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-11 22:18:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-11 22:20:36 +0300 |
| commit | 27b2ab8cf4ae9140ff53d812c142e7d65cbeee11 (patch) | |
| tree | 867c540862befafc239b6160245ae7cb71400286 /source/blender/blenkernel/BKE_sequencer.h | |
| parent | 26d7ac507763100efa5a544730813d13139a6f84 (diff) | |
Fix VSE strip channel skip overlapping strips
D1096 by @mangostaniko (with some edits)
Diffstat (limited to 'source/blender/blenkernel/BKE_sequencer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 7a47d7cecc1..c936ce5284d 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -314,7 +314,11 @@ struct Sequence *BKE_sequence_metastrip(ListBase *seqbase /* = ed->seqbase */, s void BKE_sequencer_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs); void BKE_sequencer_dupe_animdata(struct Scene *scene, const char *name_src, const char *name_dst); -bool BKE_sequence_base_shuffle(struct ListBase *seqbasep, struct Sequence *test, struct Scene *evil_scene); +bool BKE_sequence_base_shuffle_ex( + struct ListBase *seqbasep, struct Sequence *test, struct Scene *evil_scene, + int channel_delta); +bool BKE_sequence_base_shuffle( + struct ListBase *seqbasep, struct Sequence *test, struct Scene *evil_scene); bool BKE_sequence_base_shuffle_time(ListBase *seqbasep, struct Scene *evil_scene); bool BKE_sequence_base_isolated_sel_check(struct ListBase *seqbase); void BKE_sequencer_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, bool for_render); |