Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Simplify camera sample motion blur code.

Browse Source
This commit is contained in:
Thomas Dinges
2015-02-26 10:17:59 +01:00
parent 31f6e621b8
commit 8197f0bb64
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/kernel/kernel_path.h
View File

@@ -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,