[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37590] branches/cycles/source/blender/ nodes/intern: Cycles: fix crash when adding textures in material nodes, WIP code here

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Jun 17 15:01:29 CEST 2011


Revision: 37590
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37590
Author:   blendix
Date:     2011-06-17 13:01:29 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Cycles: fix crash when adding textures in material nodes, WIP code here
with new and old nodes mix was crashing.

Modified Paths:
--------------
    branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c
    branches/cycles/source/blender/nodes/intern/SHD_util.c

Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c	2011-06-17 12:48:33 UTC (rev 37589)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c	2011-06-17 13:01:29 UTC (rev 37590)
@@ -42,6 +42,9 @@
 		ShaderCallData *scd= (ShaderCallData*)data;
 		TexResult *texres = scd->texres;
 		float col[4];
+
+		if(!texres)
+			return;
 		
 		nodestack_get_vec(col, SOCK_RGBA, in[0]);
 

Modified: branches/cycles/source/blender/nodes/intern/SHD_util.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_util.c	2011-06-17 12:48:33 UTC (rev 37589)
+++ branches/cycles/source/blender/nodes/intern/SHD_util.c	2011-06-17 13:01:29 UTC (rev 37590)
@@ -83,11 +83,13 @@
 void ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr)
 {
 	ShaderCallData scd;
+	float co[3] = {0.0f, 0.0f, 0.0f};
 	
 	/* convert caller data to struct */
 	memset(&scd, 0, sizeof(scd));
 	scd.shi= shi;
 	scd.shr= shr;
+	scd.co= co;
 	
 	/* each material node has own local shaderesult, with optional copying */
 	memset(shr, 0, sizeof(ShadeResult));




More information about the Bf-blender-cvs mailing list