diff options
| author | julianeisel <julian_eisel@web.de> | 2015-01-25 00:53:22 +0300 |
|---|---|---|
| committer | julianeisel <julian_eisel@web.de> | 2015-01-25 01:01:39 +0300 |
| commit | f7e844570fea862322b235d31a781f32d4cf04d9 (patch) | |
| tree | add00eee6a5b0f8b62413405fca49d7109d8e9eb /source/blender/editors/render/render_view.c | |
| parent | 31219415d6c5e9db72b362ac3badff52ea203480 (diff) | |
Fix T43008: Support stacked fullscreen areas
Diffstat (limited to 'source/blender/editors/render/render_view.c')
| -rw-r--r-- | source/blender/editors/render/render_view.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index f7399d4e6cb..6c3572f4db9 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -161,11 +161,19 @@ ScrArea *render_view_open(bContext *C, int mx, int my) } else if (scene->r.displaymode == R_OUTPUT_SCREEN) { sa = CTX_wm_area(C); - if (sa && sa->spacetype == SPACE_IMAGE) - area_was_image = true; - /* this function returns with changed context */ - sa = ED_screen_full_newspace(C, sa, SPACE_IMAGE); + /* if the active screen is already in fullscreen mode, skip this and + * unset the area, so that the fullscreen area is just changed later */ + if (sa->full) { + sa = NULL; + } + else { + if (sa && sa->spacetype == SPACE_IMAGE) + area_was_image = true; + + /* this function returns with changed context */ + sa = ED_screen_full_newspace(C, sa, SPACE_IMAGE); + } } if (!sa) { |