[Bf-blender-cvs] [6300d22] master: Fix T39640: Crash on maximizing/minimizing UV/Image Editor

Sergey Sharybin noreply at git.blender.org
Fri Apr 11 12:18:47 CEST 2014


Commit: 6300d22dabaec5dfa82fd290dc6a3036797507f8
Author: Sergey Sharybin
Date:   Fri Apr 11 16:17:59 2014 +0600
https://developer.blender.org/rB6300d22dabaec5dfa82fd290dc6a3036797507f8

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?)

===================================================================

M	source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 064f6ca..3078b16 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;
 						}




More information about the Bf-blender-cvs mailing list