[Bf-blender-cvs] [ee78413] UI-experiments: Merge branch 'UI-graphical-redesign' into UI-experiments

[Julian Eisel]

Commit: ee7841307a97fdbc99f9db9aed41752ecdb163aa
Author: Julian Eisel
Date:   Fri Jun 5 22:55:36 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rBee7841307a97fdbc99f9db9aed41752ecdb163aa

Merge branch 'UI-graphical-redesign' into UI-experiments

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



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

diff --cc source/blender/editors/interface/interface_widgets.c
index a3c1852,1806ed4..41a1ac8
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -3589,15 -3671,9 +3758,15 @@@ static uiWidgetType *widget_type(uiWidg
  			wt.draw = widget_roundbut;
  			break;
  
 +		case UI_WTYPE_TAB:
 +			wt.custom = widget_tab;
 +			wt.wcol_theme = &btheme->tui.wcol_tab;
 +			wt.state = widget_state_tab;
 +			break;
 +
  		case UI_WTYPE_TOOLTIP:
  			wt.wcol_theme = &btheme->tui.wcol_tooltip;
- 			wt.draw = widget_menu_back;
+ 			wt.draw = widget_tooltip_back;
  			break;