[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56513] trunk/blender/source/blender/ render/intern/source: Fix crash rendering material with "Face Textures" option.

[Brecht Van Lommel]

Revision: 56513
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56513
Author:   blendix
Date:     2013-05-06 14:00:28 +0000 (Mon, 06 May 2013)
Log Message:
-----------
Fix crash rendering material with "Face Textures" option.

Example file: lib/tests/materials/crystal_cube.blend

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

Modified: trunk/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/imagetexture.c	2013-05-06 13:39:25 UTC (rev 56512)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c	2013-05-06 14:00:28 UTC (rev 56513)
@@ -224,7 +224,7 @@
 	}
 
 	/* keep this before interpolation [#29761] */
-	if ((tex->imaflag & TEX_USEALPHA) && (tex->ima->flag & IMA_IGNORE_ALPHA) == 0) {
+	if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
 		if ((tex->imaflag & TEX_CALCALPHA) == 0) {
 			texres->talpha = TRUE;
 		}
@@ -1526,7 +1526,7 @@
 	/* mipmap test */
 	image_mipmap_test(tex, ibuf);
 
-	if ((tex->imaflag & TEX_USEALPHA) && (tex->ima->flag & IMA_IGNORE_ALPHA) == 0) {
+	if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) {
 		if ((tex->imaflag & TEX_CALCALPHA) == 0) {
 			texres->talpha = TRUE;
 		}

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2013-05-06 13:39:25 UTC (rev 56512)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2013-05-06 14:00:28 UTC (rev 56513)
@@ -3475,6 +3475,7 @@
 	
 	tex= &imatex[shi->thread];
 	tex->iuser.ok= ima->ok;
+	tex->ima = ima;
 	
 	texvec[0]= 0.5f+0.5f*suv->uv[0];
 	texvec[1]= 0.5f+0.5f*suv->uv[1];