[Bf-blender-cvs] [754b70a] bake-cycles: Cycles-Bake: remaining building issues

[Dalai Felinto]

Commit: 754b70ab4c64258e432dcef626442d372b934796
Author: Dalai Felinto
Date:   Thu Apr 3 12:59:57 2014 -0300
https://developer.blender.org/rB754b70ab4c64258e432dcef626442d372b934796

Cycles-Bake: remaining building issues

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

M	intern/cycles/kernel/kernel_displace.h
M	intern/cycles/kernel/kernel_path.h

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 1456a73..6dfed72 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -105,21 +105,21 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 	float v = __uint_as_float(in.w);
 
 	int shader;
-	float3 P = triangle_point_MT(kg, prim, u, v);
-	float3 Ng = triangle_normal_MT(kg, prim, &shader);
+	float3 P, Ng;
+
+	triangle_point_normal(kg, prim, u, v, &P, &Ng, &shader);
 
 	/* dummy initilizations copied from SHADER_EVAL_DISPLACE */
 	float3 I = Ng;
 	float t = 0.0f;
 	float time = TIME_INVALID;
 	int bounce = 0;
-	int segment = ~0;
 
 	/* light passes */
 	PathRadiance L;
 
 	/* TODO, disable the closures we won't need */
-	shader_setup_from_sample(kg, &sd, P, Ng, I, shader, object, prim, u, v, t, time, bounce, segment);
+	shader_setup_from_sample(kg, &sd, P, Ng, I, shader, object, prim, u, v, t, time, bounce);
 
 	if(is_light_pass(type)){
 		RNG rng = cmj_hash(i, 0);
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index e045d91..79aeef5 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -1118,7 +1118,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
 				if(result == VOLUME_PATH_SCATTERED) {
 					/* todo: use all-light sampling */
 					if(kernel_path_integrate_scatter_lighting(kg, rng, &volume_sd, &tp, &ps, &L, &pray, num_samples_inv)) {
-						kernel_path_indirect(kg, rng, pray, buffer, tp*num_samples_inv, num_samples, ps, &L);
+						kernel_path_indirect(kg, rng, pray, tp*num_samples_inv, num_samples, ps, &L);
 
 						/* for render passes, sum and reset indirect light pass variables
 						 * for the next samples */