diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-25 13:45:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-25 13:45:16 +0300 |
| commit | f8f6f8f26eaad3b6d89a57df70114cd4fa40dc79 (patch) | |
| tree | 9d4abbf6f45f1383dcdba41c28f14967da848385 /intern/cycles/util | |
| parent | 0e29a97813d2a2df77afe64d49d1683687ed37ab (diff) | |
| parent | 16377abda8adb6444e888d1144d9225fa6415e65 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 0d27ee06fa7..348e652eadd 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -224,7 +224,7 @@ ccl_device_inline bool isfinite_safe(float f) { /* By IEEE 754 rule, 2*Inf equals Inf */ unsigned int x = __float_as_uint(f); - return (f == f) && (x == 0 || (f != 2.0f*f)) && !((x << 1) > 0xff000000u); + return (f == f) && (x == 0 || x == (1 << 31) || (f != 2.0f*f)) && !((x << 1) > 0xff000000u); } ccl_device_inline float ensure_finite(float v) |