[Bf-blender-cvs] [6bfaa33] bake-cycles: Cycles-Bake: Using aa_samples instead of samples

[Dalai Felinto]

Commit: 6bfaa33609cbcc9ab5263362c263730660b8d117
Author: Dalai Felinto
Date:   Mon Mar 24 17:34:13 2014 -0300
https://developer.blender.org/rB6bfaa33609cbcc9ab5263362c263730660b8d117

Cycles-Bake: Using aa_samples instead of samples

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

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

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 936db07..5a3be0c 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -21,7 +21,7 @@ CCL_NAMESPACE_BEGIN
 
 ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng, bool is_ao)
 {
-	int samples = kernel_data.integrator.samples;
+	int samples = kernel_data.integrator.aa_samples;
 
 	/* initialize master radiance accumulator */
 	assert(kernel_data.film.use_light_pass);
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 51ed5ac..07ac91f 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -930,9 +930,6 @@ typedef struct KernelIntegrator {
 	int volume_max_steps;
 	float volume_step_size;
 	int volume_samples;
-
-	/* baking */
-	int samples, pad6, pad7, pad8;
 } KernelIntegrator;
 
 typedef struct KernelBVH {
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index c94640b..e079e7e 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -53,7 +53,6 @@ Integrator::Integrator()
 	sample_clamp_indirect = 0.0f;
 	motion_blur = false;
 
-	samples = 1;
 	aa_samples = 0;
 	diffuse_samples = 1;
 	glossy_samples = 1;
@@ -202,8 +201,7 @@ bool Integrator::modified(const Integrator& integrator)
 		motion_blur == integrator.motion_blur &&
 		sampling_pattern == integrator.sampling_pattern &&
 		sample_all_lights_direct == integrator.sample_all_lights_direct &&
-		sample_all_lights_indirect == integrator.sample_all_lights_indirect &&
-		samples == integrator.samples);
+		sample_all_lights_indirect == integrator.sample_all_lights_indirect);
 }
 
 void Integrator::tag_update(Scene *scene)
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h
index e5b7635..2570b13 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -55,7 +55,6 @@ public:
 	float sample_clamp_indirect;
 	bool motion_blur;
 
-	int samples;
 	int aa_samples;
 	int diffuse_samples;
 	int glossy_samples;
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 07fd82f..3e8291b 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -737,18 +737,10 @@ void Session::update_scene()
 	   sampling pattern and by baking */
 	Integrator *integrator = scene->integrator;
 
-	if(integrator->sampling_pattern == SAMPLING_PATTERN_CMJ) {
-		int aa_samples = tile_manager.num_samples;
+	int aa_samples = tile_manager.num_samples;
 
-		if(aa_samples != integrator->aa_samples) {
-			integrator->aa_samples = aa_samples;
-			integrator->tag_update(scene);
-		}
-	}
-
-	int samples = tile_manager.num_samples;
-	if(samples != integrator->samples) {
-		integrator->samples = samples;
+	if(aa_samples != integrator->aa_samples) {
+		integrator->aa_samples = aa_samples;
 		integrator->tag_update(scene);
 	}