[Bf-blender-cvs] [44088be] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 44088be22d013fdcc1f49d8f9c67003ef93bbf6f
Author: Julian Eisel
Date:   Wed Jan 4 00:55:26 2017 +0100
Branches: workspaces
https://developer.blender.org/rB44088be22d013fdcc1f49d8f9c67003ef93bbf6f

Merge branch 'blender2.8' into workspaces

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



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

diff --cc source/blender/windowmanager/intern/wm_draw.c
index 14051dc2,df09331..65e0b16
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@@ -503,12 -505,10 +504,12 @@@ static void wm_draw_region_blend(wmWind
  	
  	/* region blend always is 1, except when blend timer is running */
  	if (fac < 1.0f) {
 -		wmSubWindowScissorSet(win, win->screen->mainwin, &ar->winrct, true);
 +		bScreen *screen = WM_window_get_active_screen(win);
 +
 +		wmSubWindowScissorSet(win, screen->mainwin, &ar->winrct, true);
  
  		glEnable(GL_BLEND);
- 		wm_triple_draw_textures(win, triple, 1.0f - fac);
+ 		wm_triple_draw_textures(win, triple, 1.0f - fac, false);
  		glDisable(GL_BLEND);
  	}
  }