Commit: 487705d60a0e0c619b22507d6fcfa765d1fccea0
Author: Julian Eisel
Date: Thu Sep 10 19:54:20 2015 +0200
Branches: master
https://developer.blender.org/rB487705d60a0e0c619b22507d6fcfa765d1fccea0
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.
===================================================================
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/source/blender/editors/screen/screen_edit.c
b/source/blender/editors/screen/screen_edit.c
index 0ddf08c..37b4603 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);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
