diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-15 17:22:41 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-15 17:23:10 +0400 |
| commit | 38244166b03bc4a01d8c0b99e2fd2cb2c9b60012 (patch) | |
| tree | 49f7d3321c50e2339467f99003e708975e01d71d /intern/cycles/kernel/kernel_emission.h | |
| parent | 433d55e9b45f3a828f3402d38d52f8f5e8822e88 (diff) | |
Code cleanup: Don't assign time 2x, we only need it for Object Motion here.
Diffstat (limited to 'intern/cycles/kernel/kernel_emission.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 58bdc2b70ca..cbcec4291bd 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -36,9 +36,7 @@ ccl_device_noinline float3 direct_emissive_eval(KernelGlobals *kg, float rando, #endif ray.dP = differential3_zero(); ray.dD = dI; -#ifdef __CAMERA_MOTION__ - ray.time = time; -#endif + shader_setup_from_background(kg, &sd, &ray, bounce+1); eval = shader_eval_background(kg, &sd, 0, SHADER_CONTEXT_EMISSION); } |