Cleanup: Always assign num_samples, there is no need for this special define.

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);

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;