[Bf-blender-cvs] [1f6764f] cycles_kernel_split: Cycles kernel split: Avoid having temp variable in non-split kernel

[Sergey Sharybin]

Commit: 1f6764f0d11ee400077713ff30a2d8f6b7b8b9a0
Author: Sergey Sharybin
Date:   Fri May 8 16:01:51 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB1f6764f0d11ee400077713ff30a2d8f6b7b8b9a0

Cycles kernel split: Avoid having temp variable in non-split kernel

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

M	intern/cycles/kernel/kernel_emission.h

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

diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h
index a05744d..6745a41 100644
--- a/intern/cycles/kernel/kernel_emission.h
+++ b/intern/cycles/kernel/kernel_emission.h
@@ -280,8 +280,8 @@ ccl_device_noinline float3 indirect_background(KernelGlobals *kg, ccl_addr_space
 	float3 L = shader_eval_background(kg, sd_global, state->flag, SHADER_CONTEXT_EMISSION);
 #else
 	ShaderData sd;
-	Ray priv_ray = *ray;
-	shader_setup_from_background(kg, &sd, &priv_ray, state->bounce+1, state->transparent_bounce);
+	shader_setup_from_background(kg, &sd, ray, state->bounce+1, state->transparent_bounce);
+
 	float3 L = shader_eval_background(kg, &sd, state->flag, SHADER_CONTEXT_EMISSION);
 #endif