[Bf-blender-cvs] [31cc49b] master: Code cleanup: Move AA Samples variable, this is not exclusive to Branched Path.

[Thomas Dinges]

Commit: 31cc49b5dfe623cf2919d7d740f20b0219e704bc
Author: Thomas Dinges
Date:   Sun Mar 23 12:12:59 2014 +0100
https://developer.blender.org/rB31cc49b5dfe623cf2919d7d740f20b0219e704bc

Code cleanup: Move AA Samples variable, this is not exclusive to Branched Path.

===================================================================

M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/render/integrator.cpp

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 512e7ab..67029d9 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -829,7 +829,6 @@ typedef struct KernelIntegrator {
 
 	/* branched path */
 	int branched;
-	int aa_samples;
 	int diffuse_samples;
 	int glossy_samples;
 	int transmission_samples;
@@ -844,6 +843,7 @@ typedef struct KernelIntegrator {
 
 	/* sampler */
 	int sampling_pattern;
+	int aa_samples;
 
 	/* volume render */
 	int volume_homogeneous_sampling;
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index c81e7e3..e079e7e 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -122,7 +122,6 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
 	kintegrator->sample_clamp_indirect = (sample_clamp_indirect == 0.0f)? FLT_MAX: sample_clamp_indirect*3.0f;
 
 	kintegrator->branched = (method == BRANCHED_PATH);
-	kintegrator->aa_samples = aa_samples;
 	kintegrator->diffuse_samples = diffuse_samples;
 	kintegrator->glossy_samples = glossy_samples;
 	kintegrator->transmission_samples = transmission_samples;
@@ -134,6 +133,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
 	kintegrator->sample_all_lights_indirect = sample_all_lights_indirect;
 
 	kintegrator->sampling_pattern = sampling_pattern;
+	kintegrator->aa_samples = aa_samples;
 
 	/* sobol directions table */
 	int max_samples = 1;