[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31782] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix for [#22960] UV/ Image editor - Back to Previous button

[Janne Karhu]

Revision: 31782
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31782
Author:   jhk
Date:     2010-09-06 11:46:34 +0200 (Mon, 06 Sep 2010)

Log Message:
-----------
Fix for [#22960] UV/Image editor - Back to Previous button

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	2010-09-06 08:13:28 UTC (rev 31781)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2010-09-06 09:46:34 UTC (rev 31782)
@@ -1500,8 +1500,18 @@
 	
 	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)
 				sima->flag &= ~SI_PREVSPACE;
 			if (sima->flag & SI_FULLWINDOW) {