diff options
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 319d51cdf75..1d49735d63a 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -555,7 +555,7 @@ static void widget_check_trias(uiWidgetTrias *tria, rcti *rect) /* prepares shade colors */ -static void shadecolors4(char *coltop, char *coldown, char *color, short shadetop, short shadedown) +static void shadecolors4(char *coltop, char *coldown, const char *color, short shadetop, short shadedown) { coltop[0]= CLAMPIS(color[0]+shadetop, 0, 255); @@ -569,7 +569,7 @@ static void shadecolors4(char *coltop, char *coldown, char *color, short shadeto coldown[3]= color[3]; } -static void round_box_shade_col4(char *col1, char *col2, float fac) +static void round_box_shade_col4(const char *col1, const char *col2, float fac) { int faci, facm; unsigned char col[4]; @@ -1431,7 +1431,7 @@ void ui_widget_color_init(ThemeUI *tui) /* ************ button callbacks, state ***************** */ -static void widget_state_blend(char *cp, char *cpstate, float fac) +static void widget_state_blend(char *cp, const char *cpstate, const float fac) { if(fac != 0.0f) { cp[0]= (int)((1.0f-fac)*cp[0] + fac*cpstate[0]); @@ -1523,9 +1523,9 @@ static void widget_state_label(uiWidgetType *wt, int state) widget_state(wt, state); if(state & UI_SELECT) - UI_GetThemeColor4ubv(TH_TEXT_HI, wt->wcol.text); + UI_GetThemeColor4ubv(TH_TEXT_HI, (unsigned char *)wt->wcol.text); else - UI_GetThemeColor4ubv(TH_TEXT, wt->wcol.text); + UI_GetThemeColor4ubv(TH_TEXT, (unsigned char *)wt->wcol.text); } @@ -2594,7 +2594,7 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType *wt, rcti *rect) { uiWidgetBase wtb; - char col[4]; + unsigned char col[4]; /* state copy! */ wt->wcol= *(wt->wcol_theme); @@ -2607,7 +2607,7 @@ static void widget_draw_extra_mask(const bContext *C, uiBut *but, uiWidgetType * /* make mask to draw over image */ UI_GetThemeColor3ubv(TH_BACK, col); - glColor3ubv((unsigned char*)col); + glColor3ubv(col); round_box__edges(&wtb, 15, rect, 0.0f, 4.0); widgetbase_outline(&wtb); |