diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-02 22:11:28 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-02 22:11:28 +0400 |
| commit | c9cd150f4352837e07ab58135b73a3d87a32244c (patch) | |
| tree | 45958961de4848bafce2a6bb5a80ea859d22ef6e /intern/cycles/kernel/kernel_accumulate.h | |
| parent | dfec5a36556ddbd21834daa0268a7c57ec03623d (diff) | |
Cycles compile fix: only use std::isfinite when OSL is enabled.
Diffstat (limited to 'intern/cycles/kernel/kernel_accumulate.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 6 |
1 files changed, 5 insertions, 1 deletions
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); |