[Bf-blender-cvs] [c31cd92] bake-cycles: Cycles-Bake: CUDA doesnt like make_float3(x) with one element

[Dalai Felinto]

Commit: c31cd92f4d62f7356e42191e4b935fc318666796
Author: Dalai Felinto
Date:   Mon Feb 10 16:35:01 2014 -0200
https://developer.blender.org/rBc31cd92f4d62f7356e42191e4b935fc318666796

Cycles-Bake: CUDA doesnt like make_float3(x) with one element

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

M	intern/cycles/kernel/kernel_displace.h

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index ab2082c..7754bb6 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -107,7 +107,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		else if (type == SHADER_EVAL_AO)
 			output[i] = make_float4(1.0f, 1.0f, 1.0f, 1.0f);
 		else
-			output[i] = make_float4(0.0f);
+			output[i] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
 		return;
 	}
 
@@ -138,7 +138,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		case SHADER_EVAL_NORMAL:
 		{
 			/* tangent space: normal = (2 * color) - 1 */
-			out = sd.N * 0.5f + make_float3(0.5f);
+			out = sd.N * 0.5f + make_float3(0.5f, 0.5f, 0.5f);
 			break;
 		}
 		case SHADER_EVAL_UV: