Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2015-06-08 16:59:32 +0300
committerJulian Eisel <eiseljulian@gmail.com>2015-06-08 17:04:00 +0300
commit4f9494715719d563d7f45210e45aa3056535a09b (patch)
tree4c19fc6abcf46b17d493f87221623537c280fe07 /source/blender/windowmanager/intern/wm_event_system.c
parentbcfe38aa037e2fcf1c41a3a85895c1482e21e0aa (diff)
Fix T44976: 3D View turns into an Image Editor after saving render
result Was a case of two stacked temporary fullscreens, so a quite extreme situation.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 5177e85e827..889a36b6953 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1793,7 +1793,11 @@ static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHand
BLI_remlink(handlers, handler);
if (val != EVT_FILESELECT_EXTERNAL_CANCEL) {
- ED_screen_full_prevspace(C, CTX_wm_area(C));
+ ScrArea *sa = CTX_wm_area(C);
+ const SpaceLink *sl = sa->spacedata.first;
+ const bool was_prev_temp = (sl->next && sl->next->spacetype == SPACE_IMAGE);
+
+ ED_screen_full_prevspace(C, sa, was_prev_temp);
}
wm_handler_op_context(C, handler, CTX_wm_window(C)->eventstate);