[Bf-blender-cvs] [3824416] master: Code cleanup: Don't assign time 2x, we only need it for Object Motion here.
Thomas Dinges
noreply at git.blender.org
Sat Mar 15 14:23:27 CET 2014
Commit: 38244166b03bc4a01d8c0b99e2fd2cb2c9b60012
Author: Thomas Dinges
Date: Sat Mar 15 14:22:41 2014 +0100
https://developer.blender.org/rB38244166b03bc4a01d8c0b99e2fd2cb2c9b60012
Code cleanup: Don't assign time 2x, we only need it for Object Motion here.
===================================================================
M intern/cycles/kernel/kernel_emission.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h
index 58bdc2b..cbcec42 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);
}
More information about the Bf-blender-cvs
mailing list