[Bf-blender-cvs] [5e0145f] cycles_kernel_split: Merge branch 'master' into cycles_kernel_split

Sergey Sharybin noreply at git.blender.org
Tue May 5 21:02:06 CEST 2015


Commit: 5e0145f41549a2dfd063c3dfa0ef60bad8054544
Author: Sergey Sharybin
Date:   Wed May 6 00:01:56 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB5e0145f41549a2dfd063c3dfa0ef60bad8054544

Merge branch 'master' into cycles_kernel_split

===================================================================



===================================================================

diff --cc intern/cycles/kernel/svm/svm_blackbody.h
index 5c09a94,b750ad8..a155b09
--- a/intern/cycles/kernel/svm/svm_blackbody.h
+++ b/intern/cycles/kernel/svm/svm_blackbody.h
@@@ -33,11 -33,9 +33,8 @@@
  CCL_NAMESPACE_BEGIN
  
  /* Blackbody Node */
 -
 -ccl_device void svm_node_blackbody(KernelGlobals *kg, ShaderData *sd, float *stack, uint temperature_offset, uint col_offset)
 +ccl_device void svm_node_blackbody(ccl_addr_space KernelGlobals *kg, ccl_addr_space ShaderData *sd, float *stack, uint temperature_offset, uint col_offset)
  {
- 	/* Output */
- 	float3 color_rgb = make_float3(0.0f, 0.0f, 0.0f);
- 
  	/* Input */
  	float temperature = stack_load_float(stack, temperature_offset);




More information about the Bf-blender-cvs mailing list