Commit: 5450de99ee92d50288bdd9d02ce9ebeae56c3e81
Author: Thomas Dinges
Date: Thu Jul 10 01:43:53 2014 +0200
https://developer.blender.org/rB5450de99ee92d50288bdd9d02ce9ebeae56c3e81
Cleanup: Always assign num_samples, there is no need for this special define.
===================================================================
M intern/cycles/kernel/kernel_bake.h
M intern/cycles/kernel/kernel_path_state.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_bake.h
b/intern/cycles/kernel/kernel_bake.h
index a2ff6a0..c2d14b7 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 fc51c61..43e7588 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
