[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50920] trunk/blender/source/blender/ render/intern/source/imagetexture.c: fix [#32672] Crash when rendering environment map

Campbell Barton ideasman42 at gmail.com
Thu Sep 27 04:56:49 CEST 2012


Revision: 50920
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50920
Author:   campbellbarton
Date:     2012-09-27 02:56:46 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
fix [#32672] Crash when rendering environment map
own regression since 2.63

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/imagetexture.c

Modified: trunk/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/imagetexture.c	2012-09-27 02:18:14 UTC (rev 50919)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c	2012-09-27 02:56:46 UTC (rev 50920)
@@ -1054,7 +1054,9 @@
 
 	if ((ibuf == NULL) || ((ibuf->rect == NULL) && (ibuf->rect_float == NULL))) return retval;
 
-	ima->flag |= IMA_USED_FOR_RENDER;
+	if (ima) {
+		ima->flag |= IMA_USED_FOR_RENDER;
+	}
 
 	/* mipmap test */
 	image_mipmap_test(tex, ibuf);




More information about the Bf-blender-cvs mailing list