diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-10 03:49:34 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-10 03:49:34 +0400 |
| commit | 83f5d410711b1e0f4691f3bdbbb1355be23e025a (patch) | |
| tree | 02979303e8cd0ce30b709bb2510826900697b5bd /intern/cycles | |
| parent | dda60dd2615a5b758307aaa5e231ceba31dd950e (diff) | |
Cleanup: Same thing in path trace setup, we can safely always assign the proper value.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 0b7d5acd772..0c033f6234c 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -1050,11 +1050,8 @@ ccl_device_inline void kernel_path_trace_setup(KernelGlobals *kg, ccl_global uin { float filter_u; float filter_v; -#ifdef __CMJ__ + int num_samples = kernel_data.integrator.aa_samples; -#else - int num_samples = 0; -#endif path_rng_init(kg, rng_state, sample, num_samples, rng, x, y, &filter_u, &filter_v); |