diff options
author | Thomas Dinges <blender@dingto.org> | 2014-07-10 03:43:53 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-07-10 03:43:53 +0400 |
commit | dda60dd2615a5b758307aaa5e231ceba31dd950e (patch) | |
tree | 120ea64e7e3a936f0b0de9c31cb8008f5281215b | |
parent | b2e9fffc3dce95b6dffb9b01aa4527aed5cffa4f (diff) |
Cleanup: Always assign num_samples, there is no need for this special define.
-rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_path_state.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index a2ff6a05706..c2d14b7f835 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -34,7 +34,6 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian /* init path state */ path_state_init(kg, &state, &rng, sample); - state.num_samples = kernel_data.integrator.aa_samples; /* evaluate surface shader */ float rbsdf = path_state_rng_1D(kg, &rng, &state, PRNG_BSDF); diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h index fc51c614c71..43e75885849 100644 --- a/intern/cycles/kernel/kernel_path_state.h +++ b/intern/cycles/kernel/kernel_path_state.h @@ -22,11 +22,7 @@ ccl_device_inline void path_state_init(KernelGlobals *kg, PathState *state, RNG state->rng_offset = PRNG_BASE_NUM; state->sample = sample; -#ifdef __CMJ__ state->num_samples = kernel_data.integrator.aa_samples; -#else - state->num_samples = 0; -#endif state->bounce = 0; state->diffuse_bounce = 0; |