diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 00:51:41 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 00:51:41 +0400 |
commit | a2552c5836a548bc36e3f733f842c7ace551aa38 (patch) | |
tree | c1c4dd2f6cb7ef0666970abd1a666025c8739c70 /source/blender/editors/screen/screen_edit.c | |
parent | af36eb86e23e2337411c4085f530844aa173d72d (diff) |
Fix #35882: render to image editor, ctrl+up fullscreen, click back to previous
did not work.
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index f4244245194..c274135786f 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1635,23 +1635,17 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) 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); |