Merging r40572 through r40597 from trunk into soc-2011-tomato

[blender-staging.git] / source / blender / editors / interface / interface_widgets.c

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 8c2ec6ce3abab6483522c6834e11b6c46b668830..63994348b85813ea9b6e6d97cc74b2935e9e937e 100644 (file)
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -574,7 +574,7 @@ static void widget_check_trias(uiWidgetTrias *tria, rcti *rect)
 
 
 /* prepares shade colors */
-static void shadecolors4(char *coltop, char *coldown, const char *color, short shadetop, short shadedown)
+static void shadecolors4(char coltop[4], char *coldown, const char *color, short shadetop, short shadedown)
 {
        
        coltop[0]= CLAMPIS(color[0]+shadetop, 0, 255);
@@ -889,7 +889,7 @@ static void widget_draw_icon(uiBut *but, BIFIconID icon, float alpha, rcti *rect
                        UI_icon_draw_aspect(xs, ys, icon, aspect, alpha);
        }
        
-       if(but->flag & UI_ICON_SUBMENU) {
+       if((but->flag & UI_ICON_SUBMENU) && (but->dt == UI_EMBOSSP)) {
                xs= rect->xmax-17;
                ys= (rect->ymin+rect->ymax- height)/2;
                
@@ -1493,7 +1493,7 @@ void ui_widget_color_init(ThemeUI *tui)
 
 /* ************ button callbacks, state ***************** */
 
-static void widget_state_blend(char *cp, const char *cpstate, const float fac)
+static void widget_state_blend(char cp[3], const char cpstate[3], const float fac)
 {
        if(fac != 0.0f) {
                cp[0]= (int)((1.0f-fac)*cp[0] + fac*cpstate[0]);