diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/editors/space_clip/clip_intern.h | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/editors/space_clip/clip_intern.h')
| -rw-r--r-- | source/blender/editors/space_clip/clip_intern.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index bd54d4f0016..4dc8d367f2b 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -54,26 +54,26 @@ struct wmOperatorType; void ED_clip_buttons_register(struct ARegionType *art); /* clip_dopesheet_draw.c */ -void clip_draw_dopesheet_main(struct SpaceClip *sc, struct ARegion *ar, struct Scene *scene); -void clip_draw_dopesheet_channels(const struct bContext *C, struct ARegion *ar); +void clip_draw_dopesheet_main(struct SpaceClip *sc, struct ARegion *region, struct Scene *scene); +void clip_draw_dopesheet_channels(const struct bContext *C, struct ARegion *region); /* clip_dopesheet_ops.c */ void CLIP_OT_dopesheet_select_channel(struct wmOperatorType *ot); void CLIP_OT_dopesheet_view_all(struct wmOperatorType *ot); /* clip_draw.c */ -void clip_draw_main(const struct bContext *C, struct SpaceClip *sc, struct ARegion *ar); +void clip_draw_main(const struct bContext *C, struct SpaceClip *sc, struct ARegion *region); void clip_draw_grease_pencil(struct bContext *C, int onlyv2d); -void clip_draw_cache_and_notes(const bContext *C, SpaceClip *sc, ARegion *ar); +void clip_draw_cache_and_notes(const bContext *C, SpaceClip *sc, ARegion *region); /* clip_editor.c */ void clip_start_prefetch_job(const struct bContext *C); /* clip_graph_draw.c */ -void clip_draw_graph(struct SpaceClip *sc, struct ARegion *ar, struct Scene *scene); +void clip_draw_graph(struct SpaceClip *sc, struct ARegion *region, struct Scene *scene); /* clip_graph_ops.c */ -void ED_clip_graph_center_current_frame(struct Scene *scene, struct ARegion *ar); +void ED_clip_graph_center_current_frame(struct Scene *scene, struct ARegion *region); void CLIP_OT_graph_select(struct wmOperatorType *ot); void CLIP_OT_graph_select_box(struct wmOperatorType *ot); @@ -178,7 +178,7 @@ void clip_draw_sfra_efra(struct View2D *v2d, struct Scene *scene); /* tracking_ops.c */ struct MovieTrackingTrack *tracking_marker_check_slide( - struct bContext *C, const struct wmEvent *event, int *area_r, int *action_r, int *corner_r); + struct bContext *C, const struct wmEvent *event, int *r_area, int *r_action, int *r_corner); void CLIP_OT_add_marker(struct wmOperatorType *ot); void CLIP_OT_add_marker_at_click(struct wmOperatorType *ot); |