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/editors/space_sequencer/sequencer_intern.h | |
parent | 45feeabe7ed3863074bb824e59b982301656622d (diff) | |
parent | 2ac5b55289d361de7fccc9be188b98df358ab932 (diff) |
Merge branch 'master' into cycles_oneapicycles_oneapi
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_intern.h')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 3f91be9e9e8..644e897f631 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -70,7 +70,9 @@ void color3ubv_from_seq(const struct Scene *curscene, void sequencer_special_update_set(Sequence *seq); /* Get handle width in 2d-View space. */ -float sequence_handle_size_get_clamped(struct Sequence *seq, float pixelx); +float sequence_handle_size_get_clamped(const struct Scene *scene, + struct Sequence *seq, + float pixelx); /* UNUSED */ /* void seq_reset_imageofs(struct SpaceSeq *sseq); */ @@ -113,7 +115,7 @@ void channel_draw_context_init(const struct bContext *C, /* sequencer_edit.c */ struct View2D; -void seq_rectf(struct Sequence *seq, struct rctf *rectf); +void seq_rectf(const struct Scene *scene, struct Sequence *seq, struct rctf *rectf); struct Sequence *find_nearest_seq(struct Scene *scene, struct View2D *v2d, int *hand, |