diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 5 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_light_path.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index 29eca865384..5f5a3609ded 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -378,6 +378,7 @@ ccl_device_inline float3 path_radiance_clamp_and_sum(KernelGlobals *kg, PathRadi /* Reject invalid value */ if(!isfinite(sum)) { + kernel_assert(!"Non-finite sum in path_radiance_clamp_and_sum!"); L_sum = make_float3(0.0f, 0.0f, 0.0f); L->direct_diffuse = make_float3(0.0f, 0.0f, 0.0f); @@ -445,8 +446,10 @@ ccl_device_inline float3 path_radiance_clamp_and_sum(KernelGlobals *kg, PathRadi /* Reject invalid value */ float sum = fabsf((L_sum).x) + fabsf((L_sum).y) + fabsf((L_sum).z); - if(!isfinite(sum)) + if(!isfinite(sum)) { + kernel_assert(!"Non-finite final sum in path_radiance_clamp_and_sum!"); L_sum = make_float3(0.0f, 0.0f, 0.0f); + } return L_sum; } diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/svm_light_path.h index 94c9fddfab8..f35ea05048b 100644 --- a/intern/cycles/kernel/svm/svm_light_path.h +++ b/intern/cycles/kernel/svm/svm_light_path.h @@ -62,7 +62,10 @@ ccl_device void svm_node_light_falloff(ShaderData *sd, float *stack, uint4 node) if(smooth > 0.0f) { float squared = ccl_fetch(sd, ray_length)*ccl_fetch(sd, ray_length); - strength *= squared/(smooth + squared); + /* Distant lamps set the ray length to FLT_MAX, which causes squared to overflow. */ + if(isfinite(squared)) { + strength *= squared/(smooth + squared); + } } stack_store_float(stack, out_offset, strength); |