diff options
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index af3f91f8ba8..5c97da4ebc9 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -35,7 +35,8 @@ /* elubie: TODO: move the typedef for icons to UI_interface_icons.h */ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ -#define DEF_ICON(name) name, +#define DEF_ICON(name) ICON_##name, +#define DEF_VICO(name) VICO_##name, typedef enum { #define BIFICONID_FIRST (ICON_BLENDER) @@ -45,6 +46,7 @@ typedef enum { #define BIFNICONIDS (BIFICONID_LAST-BIFICONID_FIRST + 1) } BIFIconID; #undef DEF_ICON +#undef DEF_VICO typedef enum { @@ -230,6 +232,10 @@ enum { TH_PREVIEW_BACK, TH_EDGE_CREASE, + + TH_DRAWEXTRA_EDGELEN, + TH_DRAWEXTRA_FACEAREA, + TH_DRAWEXTRA_FACEANG }; /* XXX WARNING: previous is saved in file, so do not change order! */ @@ -268,17 +274,17 @@ void UI_GetThemeColor3fv(int colorid, float *col); void UI_GetThemeColorShade3fv(int colorid, int offset, float *col); // get the 3 or 4 byte values -void UI_GetThemeColor3ubv(int colorid, char *col); -void UI_GetThemeColor4ubv(int colorid, char *col); +void UI_GetThemeColor3ubv(int colorid, unsigned char col[3]); +void UI_GetThemeColor4ubv(int colorid, unsigned char col[4]); // get a theme color from specified space type -void UI_GetThemeColorType4ubv(int colorid, int spacetype, char *col); +void UI_GetThemeColorType4ubv(int colorid, int spacetype, char col[4]); // blends and shades between two color pointers -void UI_ColorPtrBlendShade3ubv(char *cp1, char *cp2, float fac, int offset); +void UI_ColorPtrBlendShade3ubv(const unsigned char cp1[3], const unsigned char cp2[3], float fac, int offset); // get a 3 byte color, blended and shaded between two other char color pointers -void UI_GetColorPtrBlendShade3ubv(char *cp1, char *cp2, char *col, float fac, int offset); +void UI_GetColorPtrBlendShade3ubv(const unsigned char cp1[3], const unsigned char cp2[3], unsigned char col[3], float fac, int offset); // clear the openGL ClearColor using the input colorid void UI_ThemeClearColor(int colorid); @@ -287,9 +293,8 @@ void UI_ThemeClearColor(int colorid); void UI_SetTheme(int spacetype, int regionid); /* only for buttons in theme editor! */ -char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); -char *UI_ThemeColorsPup(int spacetype); +const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); -void UI_make_axis_color(char *src_col, char *dst_col, char axis); +void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis); #endif /* UI_ICONS_H */ |