2.5: merge with trunk, previous merge was only up to yesterday.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD

source/blender/nodes/intern/SHD_util.c

@@ -82,6 +82,7 @@ void ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr)
 	/* convert caller data to struct */
 	scd.shi= shi;
 	scd.shr= shr;
+	
 	/* each material node has own local shaderesult, with optional copying */
 	memset(shr, 0, sizeof(ShadeResult));