diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-05-28 20:48:28 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-05-28 20:48:28 +0300 |
| commit | 23c7d14afdb0e5b6d56d4776b487bff6ab5d232c (patch) | |
| tree | 7db01c3c6d90f0ba75e4efe05bd6e5766469ead5 /source/blender/editors/render/render_view.c | |
| parent | 18208c8ad979621d6e214e6c84f04cdeb6b091f3 (diff) | |
Fix another fullscreen toggle glitch
Steps to reproduce were: Set 3DView to fullscreen->render->toggle out of
fullscreen->escape->Area doesn't change back to 3DView
Diffstat (limited to 'source/blender/editors/render/render_view.c')
| -rw-r--r-- | source/blender/editors/render/render_view.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index fe357a7a0e2..f529c93c81c 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -245,6 +245,11 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) ScrArea *sa = CTX_wm_area(C); SpaceImage *sima = sa->spacedata.first; + /* ensure image editor fullscreen and area fullscreen states are in sync */ + if ((sima->flag & SI_FULLWINDOW) && !sa->full) { + sima->flag &= ~SI_FULLWINDOW; + } + /* test if we have a temp screen in front */ if (win->screen->temp) { wm_window_lower(win); @@ -258,8 +263,9 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) sima->flag &= ~SI_FULLWINDOW; ED_screen_full_prevspace(C, sa); } - else + else { ED_area_prevspace(C, sa); + } return OPERATOR_FINISHED; } |