archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix widget_draw_preview() not taking into account given alpha.

Browse Source 
Needed to get correct 'inactive' effect on buttons with big previews.
This commit is contained in:
Bastien Montagne
2015-05-25 22:06:25 +02:00
parent e092a58fb5
commit 1ac0fef345
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_widgets.c
View File

@@ -807,7 +807,7 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol)
#define PREVIEW_PAD 4
static void widget_draw_preview(BIFIconID icon, float UNUSED(alpha), const rcti *rect)
static void widget_draw_preview(BIFIconID icon, float alpha, const rcti *rect)
{
int w, h, size;
@@ -823,7 +823,7 @@ static void widget_draw_preview(BIFIconID icon, float UNUSED(alpha), const rcti
int x = rect->xmin + w / 2 - size / 2;
int y = rect->ymin + h / 2 - size / 2;
UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, size);
UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, alpha, size);
}
}