Commit: 63d69cf1575d8846d9b9fa51996d797d1d284c84
Author: Julian Eisel
Date: Sun Jan 22 23:26:44 2017 +0100
Branches: workspaces
https://developer.blender.org/rB63d69cf1575d8846d9b9fa51996d797d1d284c84
Merge branch 'blender2.8' into workspaces
===================================================================
===================================================================
diff --cc source/blender/windowmanager/intern/wm_draw.c
index 65e0b16853,809a5cac6e..344e231cd4
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@@ -504,12 -502,10 +501,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, false);
+ wm_triple_draw_textures(win, triple, 1.0f - fac);
glDisable(GL_BLEND);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
