From c9cd150f4352837e07ab58135b73a3d87a32244c Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Sun, 2 Sep 2012 18:11:28 +0000 Subject: [PATCH] Cycles compile fix: only use std::isfinite when OSL is enabled. --- intern/cycles/kernel/kernel_accumulate.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index 3f4cd0c4350..e73b2ba70b8 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -301,9 +301,13 @@ __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L) __device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp) { + #ifdef WITH_OSL + using std::isfinite; + #endif + float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z); - if(!std::isfinite(sum)) { + if(!isfinite(sum)) { /* invalid value, reject */ *L_sum = make_float3(0.0f, 0.0f, 0.0f);