[Bf-blender-cvs] [ec99454] bake-cycles: Cycles-Bake: fix errors after recent rebase to master

[Dalai Felinto]

Commit: ec9945406dc45bd56b8b7682c1624411e02f8fe2
Author: Dalai Felinto
Date:   Tue Feb 11 00:49:03 2014 -0200
https://developer.blender.org/rBec9945406dc45bd56b8b7682c1624411e02f8fe2

Cycles-Bake: fix errors after recent rebase to master

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

M	intern/cycles/kernel/kernel_displace.h

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 260ba60..e0f52d0 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -185,7 +185,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		}
 		case SHADER_EVAL_COMBINED:
 		{
-			out = path_radiance_sum(kg, &L);
+			out = path_radiance_clamp_and_sum(kg, &L);
 			break;
 		}
 		case SHADER_EVAL_SHADOW: