diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-05 18:14:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-05 18:14:46 +0300 |
| commit | 84a154ac68d01583b318cca43d8d8bbded127700 (patch) | |
| tree | 6414db1d253a5bbf0314a95b1cef47e2ef9da83c /source/blender/blenkernel/BKE_sequencer.h | |
| parent | ae9beb1cead99ced03798f6acad8082408323991 (diff) | |
| parent | df267bd4c48a3b73ad959951419161ae8f9ed126 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_sequencer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 2264167eca1..62e09809dea 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -405,6 +405,8 @@ struct Sequence *BKE_sequence_alloc(ListBase *lb, int cfra, int machine); void BKE_sequence_alpha_mode_from_extension(struct Sequence *seq); void BKE_sequence_init_colorspace(struct Sequence *seq); +float BKE_sequence_get_fps(struct Scene *scene, struct Sequence *seq); + /* RNA enums, just to be more readable */ enum { SEQ_SIDE_NONE = 0, |