[Bf-blender-cvs] [abd630d] master: Disable Bake Jitter code (recently added)

[Dalai Felinto]

Commit: abd630de62d2cdc1868dcc1610a9970d98fb8d97
Author: Dalai Felinto
Date:   Mon Feb 23 17:46:52 2015 -0300
Branches: master
https://developer.blender.org/rBabd630de62d2cdc1868dcc1610a9970d98fb8d97

Disable Bake Jitter code (recently added)

The following commits were supposed to add anti-alias and help with OSL
baking:

7b16fda3799d5b7167ef7ffe533d654810f44e36
1b92dfa96160f8151972d73337d5a927d8b89297

However they introduced other issues (artifacts mostly), see T43550 .
Leaving the code ifdef'ed for now.

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

M	intern/cycles/kernel/kernel_bake.h

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

diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index d34a3e3..20d7a14 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -16,6 +16,8 @@
 
 CCL_NAMESPACE_BEGIN
 
+#undef USE_BAKE_JITTER
+
 ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng,
                                    const bool is_combined, const bool is_ao, const bool is_sss, int sample)
 {
@@ -199,6 +201,8 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 
 	/* random number generator */
 	RNG rng = cmj_hash(offset + i, kernel_data.integrator.seed);
+
+#ifdef USE_BAKE_JITTER
 	float filter_x, filter_y;
 	if(sample == 0) {
 		filter_x = filter_y = 0.5f;
@@ -212,6 +216,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		u = bake_clamp_mirror_repeat(u + dudx*(filter_x - 0.5f) + dudy*(filter_y - 0.5f));
 		v = bake_clamp_mirror_repeat(v + dvdx*(filter_x - 0.5f) + dvdy*(filter_y - 0.5f));
 	}
+#endif
 
 	/* triangle */
 	int shader;