Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-07-10 03:43:53 +0400
committerThomas Dinges <blender@dingto.org>2014-07-10 03:43:53 +0400
commitdda60dd2615a5b758307aaa5e231ceba31dd950e (patch)
tree120ea64e7e3a936f0b0de9c31cb8008f5281215b /intern/cycles/kernel/kernel_path_state.h
parentb2e9fffc3dce95b6dffb9b01aa4527aed5cffa4f (diff)
Cleanup: Always assign num_samples, there is no need for this special define.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_state.h')
-rw-r--r--intern/cycles/kernel/kernel_path_state.h4
1 files changed, 0 insertions, 4 deletions
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;