diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-06 11:44:49 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-06 11:44:49 +0400 |
| commit | ab4b74f1edc68c65b2b12167354d59d61cf9800f (patch) | |
| tree | e40ebdcd74bedaafb12b7b85af8e59ec40992d82 /intern/cycles/kernel/kernel_accumulate.h | |
| parent | afaa67b5b8770a8f02f0501d0f9205e066e91ef9 (diff) | |
Cycles compiler fixes related to OSL changes:
* reverted r50430
* removed 2 util_params.h includes from r50428, these were causing trouble with OIIO in CUDA compilation. The purpose of these was to define the ustring type, but can just use the standard string type from util_string as well.
Diffstat (limited to 'intern/cycles/kernel/kernel_accumulate.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index bd03537519f..2f2314c9a8b 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -301,7 +301,9 @@ __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L) __device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp) { + #ifdef __OSL__ using std::isfinite; + #endif float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z); |