[Bf-blender-cvs] [67f8e71] bake-cycles: Cycles-Bake: NORMAL baked in tangent space

Dalai Felinto noreply at git.blender.org
Wed Apr 23 02:46:50 CEST 2014


Commit: 67f8e71e51d1b1b6494da1a5e83e738169b4c75d
Author: Dalai Felinto
Date:   Wed Jan 22 21:29:24 2014 -0200
https://developer.blender.org/rB67f8e71e51d1b1b6494da1a5e83e738169b4c75d

Cycles-Bake: NORMAL baked in tangent space

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

M	intern/cycles/kernel/kernel_displace.h

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 9c50584..091e87c 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -53,8 +53,8 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		/* data passes */
 		case SHADER_EVAL_NORMAL:
 		{
-			/* TODO: code the normal in whatever space we want */
-			out = sd.N;
+			/* tangent space: normal = (2 * color) - 1 */
+			out = sd.N * 0.5f + make_float3(0.5f);
 			break;
 		}
 		case SHADER_EVAL_UV:




More information about the Bf-blender-cvs mailing list