diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 14:49:18 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 14:49:18 +0300 |
| commit | 642e5ec78cd2592ab1797b2e84eda060a223b4c5 (patch) | |
| tree | e2fb7a6c7062185bf6126e4122478ed04d47759d /source/blender/blenkernel/BKE_sequencer.h | |
| parent | 395dfff103e10687cb370cb3470ca667afd2acd5 (diff) | |
| parent | aa123555d7a75c784f479b9572145f45862bcb2b (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/blenkernel/BKE_sequencer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index aba3a5d5b8d..bc312c7bb2b 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -413,7 +413,10 @@ bool BKE_sequence_base_shuffle_ex(struct ListBase *seqbasep, 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_shuffle_time(ListBase *seqbasep, + struct Scene *evil_scene, + ListBase *markers, + const bool use_sync_markers); bool BKE_sequence_base_isolated_sel_check(struct ListBase *seqbase); void BKE_sequencer_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, bool for_render); struct Sequence *BKE_sequence_dupli_recursive(const struct Scene *scene_src, |