diff options
| author | Xavier Hallade <xavier.hallade@intel.com> | 2022-06-29 17:31:04 +0300 |
|---|---|---|
| committer | Xavier Hallade <xavier.hallade@intel.com> | 2022-06-29 17:31:04 +0300 |
| commit | 5299deca6deb5109aeab62c2755c92dbc711601b (patch) | |
| tree | c905401fae4b0271d28f73be44a2f0581b681851 /source/blender/sequencer/intern/render.h | |
| parent | 45feeabe7ed3863074bb824e59b982301656622d (diff) | |
| parent | 2ac5b55289d361de7fccc9be188b98df358ab932 (diff) | |
Merge branch 'master' into cycles_oneapicycles_oneapi
Diffstat (limited to 'source/blender/sequencer/intern/render.h')
| -rw-r--r-- | source/blender/sequencer/intern/render.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.h index d41a0e3f86f..3690eb71ac4 100644 --- a/source/blender/sequencer/intern/render.h +++ b/source/blender/sequencer/intern/render.h @@ -44,7 +44,8 @@ struct ImBuf *seq_render_effect_execute_threaded(struct SeqEffectHandle *sh, struct ImBuf *ibuf2, struct ImBuf *ibuf3); void seq_imbuf_to_sequencer_space(struct Scene *scene, struct ImBuf *ibuf, bool make_float); -int seq_get_shown_sequences(struct ListBase *channels, +int seq_get_shown_sequences(const struct Scene *scene, + struct ListBase *channels, struct ListBase *seqbase, int timeline_frame, int chanshown, |