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-09-10 20:54:20 +0300
committerJulian Eisel <eiseljulian@gmail.com>2015-09-10 20:54:20 +0300
commit487705d60a0e0c619b22507d6fcfa765d1fccea0 (patch)
tree6fa92d04ce61c0c48c9f61692974498bef9caaa6
parent37f46606374f37dbe73c3555dc04c96a56e90bf3 (diff)
Fix T46069: Crash when saving a render with non-fullscreen file editor
IMAGE_OT_save_as assumes that active area is an Image Editor and the logic that should return to image editor after saving didn't run after fullscreen was manually exited.
-rw-r--r--source/blender/editors/screen/screen_edit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 0ddf08c8404..37b4603974f 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1800,7 +1800,12 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa, const bool was_prev_temp
}
}
else {
- ED_screen_restore_temp_type(C, sa);
+ if (sa->full) {
+ ED_screen_restore_temp_type(C, sa);
+ }
+ else {
+ ED_area_prevspace(C, sa);
+ }
}
}