diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 151e762020b..9f3709ea5f7 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -1191,14 +1191,15 @@ ccl_device_inline void kernel_path_trace_setup(KernelGlobals *kg, ccl_global uin if(kernel_data.cam.aperturesize > 0.0f) path_rng_2D(kg, rng, sample, num_samples, PRNG_LENS_U, &lens_u, &lens_v); - float time = 0.0f; - #ifdef __CAMERA_MOTION__ - if(kernel_data.cam.shuttertime != -1.0f) - time = path_rng_1D(kg, rng, sample, num_samples, PRNG_TIME); + /* motion blur */ + if(kernel_data.cam.shuttertime == -1.0f) + ray->time = TIME_INVALID; + else + ray->time = path_rng_1D(kg, rng, sample, num_samples, PRNG_TIME); #endif - camera_sample(kg, x, y, filter_u, filter_v, lens_u, lens_v, time, ray); + camera_sample(kg, x, y, filter_u, filter_v, lens_u, lens_v, ray); } ccl_device void kernel_path_trace(KernelGlobals *kg, |