[Bf-blender-cvs] [d3df8d0] temp-menu_shadow_theme_color: Use color alpha for menu shadows

[julianeisel]

Commit: d3df8d0c8289d1f9d3b1d0223fb7cfc9a129dff6
Author: julianeisel
Date:   Thu Jan 8 23:19:56 2015 +0100
Branches: temp-menu_shadow_theme_color
https://developer.blender.org/rBd3df8d0c8289d1f9d3b1d0223fb7cfc9a129dff6

Use color alpha for menu shadows

===================================================================

M       source/blender/editors/interface/interface_widgets.c
M       source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/editors/interface/interface_widgets.c 
b/source/blender/editors/interface/interface_widgets.c
index da98030..312d1c0 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2096,7 +2096,7 @@ static void widget_softshadow(const rcti *rect, int 
roundboxalign, const float r
        bTheme *btheme = UI_GetTheme();
        uiWidgetBase wtb;
        rcti rect1 = *rect;
-       float alphastep;
+       char alpha;
        int step, totvert;
        float quad_strip[WIDGET_SIZE_MAX * 2 + 2][2];
        const float radout = UI_ThemeMenuShadowWidth();
@@ -2115,7 +2115,7 @@ static void widget_softshadow(const rcti *rect, int 
roundboxalign, const float r
        totvert = round_box_shadow_edges(wtb.inner_v, &rect1, radin, 
roundboxalign & (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT), 0.0f);
 
        /* we draw a number of increasing size alpha quad strips */
-       alphastep = 3.0f * btheme->tui.menu_shadow_fac / radout;
+       alpha = (3.0f * btheme->tui.menu_shadow[3] / radout);
        
        glEnableClientState(GL_VERTEX_ARRAY);
 
@@ -2124,7 +2124,7 @@ static void widget_softshadow(const rcti *rect, int 
roundboxalign, const float r
                
                round_box_shadow_edges(wtb.outer_v, &rect1, radin, UI_CNR_ALL, 
(float)step);
                
-               glColor4ub(btheme->tui.menu_shadow[0], 
btheme->tui.menu_shadow[1], btheme->tui.menu_shadow[2], (alphastep * (1.0f - 
expfac)) * 255.0f);
+               glColor4ub(UNPACK3(btheme->tui.menu_shadow), (alpha * (1.0f - 
expfac)));
 
                widget_verts_to_quad_strip(&wtb, totvert, quad_strip);
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c 
b/source/blender/makesrna/intern/rna_userdef.c
index 164579f..4c23617 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1036,7 +1036,7 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "menu_shadow", PROP_FLOAT, 
PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "menu_shadow");
-       RNA_def_property_array(prop, 3);
+       RNA_def_property_array(prop, 4);
        RNA_def_property_ui_text(prop, "Shadow Color", "Color of menu shadows");
        RNA_def_property_update(prop, 0, "rna_userdef_update");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs