[Bf-blender-cvs] [fc85096dc8e] blender2.8: Fix T55387: Render fullscreen from top menu crashes Blender

Julian Eisel noreply at git.blender.org
Fri Jun 8 15:59:54 CEST 2018

Commit: fc85096dc8e12e3c83621d153e13cab7bdf1860d
Author: Julian Eisel
Date:   Fri Jun 8 15:57:01 2018 +0200
Branches: blender2.8

Fix T55387: Render fullscreen from top menu crashes Blender

Would try to use data from global area for the newly created fullscreen area.
This should not happen, so instead of a global area use first area from layout.


M	source/blender/editors/screen/screen_edit.c


diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index ec2cb641bcd..ac4ab3461a3 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1503,7 +1503,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
 		/* use random area when we have no active one, e.g. when the
 		 * mouse is outside of the window and we open a file browser */
-		if (!sa) {
+		if (!sa || sa->global) {
 			sa = oldscreen->areabase.first;

More information about the Bf-blender-cvs mailing list