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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-04-11 14:17:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-04-11 14:17:59 +0400
commit6300d22dabaec5dfa82fd290dc6a3036797507f8 (patch)
tree904738a668c310a99da74ba79a65e3f30819a750 /source/blender/editors/render
parent5a29b55c07e34411747c091195a1a1e5fcb1ef7d (diff)
Fix T39640: Crash on maximizing/minimizing UV/Image Editor
Added a NULL-pointer check for now, actual issue might be burried somewhere else (aka maybe traversal of the WM is not actually correct here?)
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 064f6ca3d1e..3078b16ceeb 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -478,7 +478,8 @@ static void render_image_update_pass_and_layer(RenderJob *rj, RenderResult *rr,
for (sa = win->screen->areabase.first; sa; sa = sa->next) {
if (sa->spacetype == SPACE_IMAGE) {
SpaceImage *sima = sa->spacedata.first;
- if (sima->image == rj->image) {
+ // sa->spacedata might be empty when toggling fullscreen mode.
+ if (sima != NULL && sima->image == rj->image) {
if (first_sa == NULL) {
first_sa = sa;
}