[Bf-blender-cvs] [3a3edc6] master: Revert "fix T40375 Glossy shader bakes different than render"

[Dalai Felinto]

Commit: 3a3edc6c2d2b137a0b267c0af5ad01c5f2349bb9
Author: Dalai Felinto
Date:   Thu May 29 01:16:45 2014 -0300
https://developer.blender.org/rB3a3edc6c2d2b137a0b267c0af5ad01c5f2349bb9

Revert "fix T40375 Glossy shader bakes different than render"

This reverts commit 12abe94de827d9ae9c0dd6cc49bc6c3e377842ad.

After a long discussion in the bug tracker we decided baking should use
the faces normals for glossy (and combined). This is what Blender
Internal is doing, and one of the more predictable way of yielding
predictable results.

That also means the result will not match the render perfectly, but this
is preferrable over the alternatives at hand.

Conflicts:
	intern/cycles/kernel/kernel_bake.h

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

M	intern/cycles/kernel/kernel_bake.h

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

diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index c77a155..e31090f 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -180,8 +180,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 	PathRadiance L;
 
 	shader_setup_from_sample(kg, &sd, P, Ng, I, shader, object, prim, u, v, t, time, bounce, transparent_bounce);
-
-	sd.I = camera_direction_from_point(kg, sd.P);
+	sd.I = sd.N;
 
 	/* update differentials */
 	sd.dP.dx = sd.dPdu * dudx + sd.dPdv * dvdx;