[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56620] trunk/blender/source/blender/ render/intern/source/imagetexture.c: fix [#35280] blender crashes when setting Environment Map imagefile

[Campbell Barton]

Revision: 56620
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56620
Author:   campbellbarton
Date:     2013-05-09 14:01:42 +0000 (Thu, 09 May 2013)
Log Message:
-----------
fix [#35280] blender crashes when setting Environment Map imagefile

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	2013-05-09 13:05:36 UTC (rev 56619)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c	2013-05-09 14:01:42 UTC (rev 56620)
@@ -1109,9 +1109,12 @@
 	/* mipmap test */
 	image_mipmap_test(tex, ibuf);
 	
-	if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
-		if ((tex->imaflag & TEX_CALCALPHA) == 0)
-			texres->talpha = 1;
+	if (ima) {
+		if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
+			if ((tex->imaflag & TEX_CALCALPHA) == 0) {
+				texres->talpha = 1;
+			}
+		}
 	}
 	texr.talpha = texres->talpha;