diff options
Diffstat (limited to 'source/blender/editors/include/UI_view2d.h')
| -rw-r--r-- | source/blender/editors/include/UI_view2d.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index bf4a3de9cc6..7cad1d82d50 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -57,7 +57,7 @@ enum { /* headers (this is basically the same as listview, but no y-panning) */ V2D_COMMONVIEW_HEADER, /* ui region containing panels */ - V2D_COMMONVIEW_PANELS_UI, + V2D_COMMONVIEW_PANELS_UI } eView2D_CommonViewTypes; /* ---- Defines for Scroller/Grid Arguments ----- */ @@ -76,13 +76,13 @@ enum { V2D_UNIT_VALUES, V2D_UNIT_DEGREES, V2D_UNIT_TIME, - V2D_UNIT_SECONDSSEQ, + V2D_UNIT_SECONDSSEQ } eView2D_Units; /* clamping of grid values to whole numbers */ enum { V2D_GRID_NOCLAMP = 0, - V2D_GRID_CLAMP, + V2D_GRID_CLAMP } eView2D_Clamp; /* flags for grid-lines to draw */ @@ -156,14 +156,14 @@ void UI_view2d_totRect_set_resize(struct View2D *v2d, int width, int height, int int UI_view2d_tab_set(struct View2D *v2d, int tab); /* view matrix operations */ -void UI_view2d_view_ortho(const struct bContext *C, struct View2D *v2d); -void UI_view2d_view_orthoSpecial(const struct bContext *C, struct View2D *v2d, short xaxis); +void UI_view2d_view_ortho(struct View2D *v2d); +void UI_view2d_view_orthoSpecial(struct ARegion *ar, struct View2D *v2d, short xaxis); void UI_view2d_view_restore(const struct bContext *C); /* grid drawing */ -View2DGrid *UI_view2d_grid_calc(const struct bContext *C, struct View2D *v2d, short xunits, short xclamp, short yunits, short yclamp, int winx, int winy); -void UI_view2d_grid_draw(const struct bContext *C, struct View2D *v2d, View2DGrid *grid, int flag); -void UI_view2d_constant_grid_draw(const struct bContext *C, struct View2D *v2d); +View2DGrid *UI_view2d_grid_calc(struct Scene *scene, struct View2D *v2d, short xunits, short xclamp, short yunits, short yclamp, int winx, int winy); +void UI_view2d_grid_draw(struct View2D *v2d, View2DGrid *grid, int flag); +void UI_view2d_constant_grid_draw(struct View2D *v2d); void UI_view2d_grid_size(View2DGrid *grid, float *r_dx, float *r_dy); void UI_view2d_grid_free(View2DGrid *grid); @@ -191,8 +191,8 @@ void UI_view2d_getscale(struct View2D *v2d, float *x, float *y); short UI_view2d_mouse_in_scrollers(const struct bContext *C, struct View2D *v2d, int x, int y); /* cached text drawing in v2d, to allow pixel-aligned draw as post process */ -void UI_view2d_text_cache_add(struct View2D *v2d, float x, float y, char *str); -void UI_view2d_text_cache_rectf(struct View2D *v2d, struct rctf *rect, char *str); +void UI_view2d_text_cache_add(struct View2D *v2d, float x, float y, const char *str, const char col[4]); +void UI_view2d_text_cache_rectf(struct View2D *v2d, struct rctf *rect, const char *str, const char col[4]); void UI_view2d_text_cache_draw(struct ARegion *ar); /* operators */ |