diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-16 01:11:14 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-16 01:11:14 +0400 |
commit | 91c1f9ee770d12694425714a3c5966b9693b2ba5 (patch) | |
tree | 332f5d071b1d221664bb66b86de339902ae54349 /source | |
parent | 2c895318e91727f867225597d990bb712de87918 (diff) |
Commit patch from Nicholas Bishop with some small modifications
to make nicer displaying of brush names.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 0e51932df90..72bab289713 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1367,7 +1367,7 @@ static struct uiWidgetColors wcol_menu_item= { {0, 0, 0, 255}, {0, 0, 0, 0}, {86, 128, 194, 255}, - {255, 255, 255, 255}, + {172, 172, 172, 128}, {255, 255, 255, 255}, {0, 0, 0, 255}, @@ -3297,15 +3297,17 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int bg_rect = trect; bg_rect.xmin = rect->xmin + PREVIEW_PAD; bg_rect.ymin = rect->ymin + PREVIEW_PAD; - bg_rect.xmax += PREVIEW_PAD / 2; + bg_rect.xmax = rect->xmax - PREVIEW_PAD; bg_rect.ymax += PREVIEW_PAD / 2; if(bg_rect.xmax > rect->xmax - PREVIEW_PAD) bg_rect.xmax = rect->xmax - PREVIEW_PAD; UI_GetThemeColor3ubv(TH_BUTBACK, bg_col); - glColor3ubv(bg_col); + glColor4ubv((unsigned char*)wt->wcol.item); + glEnable(GL_BLEND); glRecti(bg_rect.xmin, bg_rect.ymin, bg_rect.xmax, bg_rect.ymax); + glDisable(GL_BLEND); if (state == UI_ACTIVE) glColor3ubv((unsigned char*)wt->wcol.text); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 8dd17888e22..5d4b1e6216e 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1736,6 +1736,14 @@ void init_userdef_do_versions(void) U.use_16bit_textures = 1; } + if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 2)) { + bTheme *btheme; + for(btheme= U.themes.first; btheme; btheme= btheme->next) { + if (btheme->tui.wcol_menu_item.item[3] == 255) + SETCOL(btheme->tui.wcol_menu_item.item, 172, 172, 172, 128); + } + } + /* GL Texture Garbage Collection (variable abused above!) */ if (U.textimeout == 0) { U.texcollectrate = 60; |