[Bf-blender-cvs] [3df270b1cf0] topbar: Merge branch 'blender2.8' into topbar

[Julian Eisel]

Commit: 3df270b1cf0c55750fd3752ac38a3d96947b7a43
Author: Julian Eisel
Date:   Thu Apr 12 14:42:55 2018 +0200
Branches: topbar
https://developer.blender.org/rB3df270b1cf0c55750fd3752ac38a3d96947b7a43

Merge branch 'blender2.8' into topbar

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



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

diff --cc source/blender/editors/interface/interface_widgets.c
index 3bdad2891d5,5a210d01f27..84f0adf333f
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -3873,15 -3885,16 +3890,20 @@@ static void widget_tab(uiWidgetColors *
  	round_box_edges(&wtb, roundboxalign, rect, rad);
  
  	/* draw inner */
 +#ifdef USE_TAB_SHADED_HIGHLIGHT
  	wtb.draw_outline = 0;
 +#endif
  	widgetbase_draw(&wtb, wcol);
  
+ 	/* We are drawing on top of widget bases. Flush cache. */
+ 	glEnable(GL_BLEND);
+ 	UI_widgetbase_draw_cache_flush();
+ 	glDisable(GL_BLEND);
+ 
 +#ifdef USE_TAB_SHADED_HIGHLIGHT
  	/* draw outline (3d look) */
  	ui_draw_but_TAB_outline(rect, rad, theme_col_tab_highlight, (unsigned char *)wcol->inner);
 +#endif
  
  	/* text shadow */
  	BLF_enable(fontid, BLF_SHADOW);