[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57787] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix #35882: render to image editor, ctrl+up fullscreen, click back to previous

[Brecht Van Lommel]

Revision: 57787
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57787
Author:   blendix
Date:     2013-06-26 20:51:41 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Fix #35882: render to image editor, ctrl+up fullscreen, click back to previous
did not work.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2013-06-26 20:48:49 UTC (rev 57786)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2013-06-26 20:51:41 UTC (rev 57787)
@@ -1635,23 +1635,17 @@
 	if (sl->next) {
 		/* specific checks for space types */
 
-		int sima_restore = 0;
-
 		/* Special check added for non-render image window (back from fullscreen through "Back to Previous" button) */
 		if (sl->spacetype == SPACE_IMAGE) {
 			SpaceImage *sima = sa->spacedata.first;
-			if (!(sima->flag & SI_PREVSPACE) && !(sima->flag & SI_FULLWINDOW))
-				sima_restore = 1;
-		}
 
-		if (sl->spacetype == SPACE_IMAGE && !sima_restore) {
-			SpaceImage *sima = sa->spacedata.first;
-			if (sima->flag & SI_PREVSPACE)
+			if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW)) {
 				sima->flag &= ~SI_PREVSPACE;
-			if (sima->flag & SI_FULLWINDOW) {
 				sima->flag &= ~SI_FULLWINDOW;
 				ED_screen_full_prevspace(C, sa);
 			}
+			else
+				ED_screen_full_toggle(C, win, sa);
 		}
 		else if (sl->spacetype == SPACE_FILE) {
 			ED_screen_full_prevspace(C, sa);