2.5

- Fun for testers: Added "Redo Operator" Panel in view3d 'nkey' region.
  It's going to be part of tools UI I know, but this will give good
  tests of what goes on with operators. I had to add small fixes in 
  Transform for it already. :)
  One important issue to note is that it lists every operator, also from
  non-3D-window ops. Needs checked or classified somehow.

- Fix: removed bad 2.4x hack from how pulldown menus were defined. Made
  widget code cleaner, and will show menus like SHIFT+A correct now.

2 files changed, 9 insertions, 10 deletions

diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 261d36cf38e..9e7d13b68cc 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -584,11 +584,15 @@ static void ui_draw_panel_header_style(ARegion *ar, uiStyle *style, uiBlock *blo
 		panelname= pa->drawname[0]?pa->drawname:pa->panelname;
 		
 		if(pa->active && (pa==panel || pa->paneltab==panel)) {
+			float col[3];
+			
+			UI_GetThemeColor3fv(TH_TEXT, col);
+
 			/* active tab */
 			if(pa==panel)
-				UI_ThemeColor(TH_TEXT);
+				glColor4f(col[0], col[1], col[2], 1.0f);
 			else
-				UI_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
+				glColor4f(col[0], col[1], col[2], 0.5f);
 			
 			hrect= *rect;
 			hrect.xmin= rect->xmin+pnl_icons + a*width;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index abaa832957d..3025b1bfc29 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1531,11 +1531,12 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int rou
 
 static void widget_disabled(rcti *rect)
 {
-	float col[3];
+	float col[4];
 	
 	glEnable(GL_BLEND);
 	
-	UI_GetThemeColor3fv(TH_BACK, col);
+	/* can't use theme TH_BACK or TH_PANEL... undefined */
+	glGetFloatv(GL_COLOR_CLEAR_VALUE, col);
 	glColor4f(col[0], col[1], col[2], 0.5f);
 	glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 
@@ -1708,12 +1709,6 @@ void ui_draw_but(ARegion *ar, uiStyle *style, uiBut *but, rcti *rect)
 			case SEPR:
 				break;
 				
-			/* XXX in old code UI_EMBOSSP was set to distinguish these types, fix */
-			case PULLDOWN:
-			case HMENU:
-				wt= widget_type(UI_WTYPE_PULLDOWN);
-				break;
-				
 			default:
 				wt= widget_type(UI_WTYPE_MENU_ITEM);
 		}