[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44909] trunk/blender/source/blender/ editors/interface: Commit patch from Nicholas Bishop with some small modifications

[Sergey Sharybin]

Revision: 44909
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44909
Author:   nazgul
Date:     2012-03-15 21:11:14 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Commit patch from Nicholas Bishop with some small modifications
to make nicer displaying of brush names.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-03-15 20:25:07 UTC (rev 44908)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-03-15 21:11:14 UTC (rev 44909)
@@ -1367,7 +1367,7 @@
 	{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 @@
 	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);

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2012-03-15 20:25:07 UTC (rev 44908)
+++ trunk/blender/source/blender/editors/interface/resources.c	2012-03-15 21:11:14 UTC (rev 44909)
@@ -1736,6 +1736,14 @@
 		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;