[Bf-blender-cvs] [b315fcb] master: Fix T44514 Crash under cycles rendering using F12, based on patch from Gaia Clary

Dalai Felinto noreply at git.blender.org
Mon Apr 27 15:45:56 CEST 2015


Commit: b315fcb7edb7222c97facc2413d3772702533dd2
Author: Dalai Felinto
Date:   Mon Apr 27 10:33:18 2015 -0300
Branches: master
https://developer.blender.org/rBb315fcb7edb7222c97facc2413d3772702533dd2

Fix T44514 Crash under cycles rendering using F12, based on patch from Gaia Clary

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b9a76a1..d76537a 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3582,10 +3582,12 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 		rectz = rv->rectz;
 	}
 	else {
-		/* XXX This should never happen, yet it does - T44498
+		/* XXX This should never happen, yet it does - T44498, T44514
 	     * I'm waiting to investigate more, but meanwhile this fix
 	     * the immediate issue */
 		rect = NULL;
+		rectf = NULL;
+		rectz = NULL;
 	}
 	dither = iuser->scene->r.dither_intensity;




More information about the Bf-blender-cvs mailing list