[Bf-blender-cvs] [59f39055a8a] topbar: Merge branch 'blender2.8' into topbar

[Julian Eisel]

Commit: 59f39055a8a0677ac075d56d2da1b40f7444b6c7
Author: Julian Eisel
Date:   Sat Sep 16 07:41:06 2017 +0200
Branches: topbar
https://developer.blender.org/rB59f39055a8a0677ac075d56d2da1b40f7444b6c7

Merge branch 'blender2.8' into topbar

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



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

diff --cc source/blender/editors/screen/screen_edit.c
index e0ef6d15a82,fca2def644c..4331ec2bb07
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@@ -1389,10 -1477,23 +1387,21 @@@ ScrArea *ED_screen_state_toggle(bContex
  
  		sc->state = SCREENNORMAL;
  
- 		/* find old area */
- 		for (old = sc->areabase.first; old; old = old->next)
- 			if (old->full) break;
- 		if (old == NULL) {
+ 		/* find old area to restore from */
+ 		ScrArea *fullsa = NULL;
+ 		for (ScrArea *old = sc->areabase.first; old; old = old->next) {
+ 			/* area to restore from is always first */
+ 			if (old->full && !fullsa) {
+ 				fullsa = old;
+ 			}
+ 
+ 			/* clear full screen state */
+ 			old->full = NULL;
 -			old->flag &= ~AREA_TEMP_INFO;
+ 		}
+ 
 -		sa->flag &= ~AREA_TEMP_INFO;
+ 		sa->full = NULL;
+ 
+ 		if (fullsa == NULL) {
  			if (G.debug & G_DEBUG)
  				printf("%s: something wrong in areafullscreen\n", __func__);
  			return NULL;