diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /source/blender/sequencer/SEQ_render.h | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'source/blender/sequencer/SEQ_render.h')
-rw-r--r-- | source/blender/sequencer/SEQ_render.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.h index a74eba5fc6f..9c163de4230 100644 --- a/source/blender/sequencer/SEQ_render.h +++ b/source/blender/sequencer/SEQ_render.h @@ -79,20 +79,23 @@ struct ImBuf *SEQ_get_thumbnail(const struct SeqRenderData *context, /** * Get frame for first thumbnail. */ -float SEQ_render_thumbnail_first_frame_get(struct Sequence *seq, +float SEQ_render_thumbnail_first_frame_get(const struct Scene *scene, + struct Sequence *seq, float frame_step, struct rctf *view_area); /** * Get frame for first thumbnail. */ -float SEQ_render_thumbnail_next_frame_get(struct Sequence *seq, +float SEQ_render_thumbnail_next_frame_get(const struct Scene *scene, + struct Sequence *seq, float last_frame, float frame_step); /** * Get frame step for equally spaced thumbnails. These thumbnails should always be present in * memory, so they can be used when zooming. */ -int SEQ_render_thumbnails_guaranteed_set_frame_step_get(const struct Sequence *seq); +int SEQ_render_thumbnails_guaranteed_set_frame_step_get(const struct Scene *scene, + const struct Sequence *seq); /** * Render set of evenly spaced thumbnails that are drawn when zooming.. */ @@ -112,7 +115,9 @@ void SEQ_render_new_render_data(struct Main *bmain, int for_render, SeqRenderData *r_context); int SEQ_render_evaluate_frame(struct ListBase *seqbase, int timeline_frame); -struct StripElem *SEQ_render_give_stripelem(struct Sequence *seq, int timeline_frame); +struct StripElem *SEQ_render_give_stripelem(const struct Scene *scene, + struct Sequence *seq, + int timeline_frame); void SEQ_render_imbuf_from_sequencer_space(struct Scene *scene, struct ImBuf *ibuf); void SEQ_render_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4]); |