diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 19:18:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 19:18:16 +0300 |
| commit | c2814f5b28235f8cd621ea9dc965b37c97801d76 (patch) | |
| tree | c1ca07a390906954b45bc5944bdb1efbc93ab867 /intern | |
| parent | ac8b641b77e08e551a37feb7394349bbd1f0bbee (diff) | |
| parent | 73c577d46a2fd99c519ce7ef0fd9deb3b914099f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_ssef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h index bb007ff84a9..e9a617bb2cc 100644 --- a/intern/cycles/util/util_ssef.h +++ b/intern/cycles/util/util_ssef.h @@ -606,7 +606,7 @@ ccl_device_inline const ssef uint32_to_float(const ssei &in) template<size_t S1, size_t S2, size_t S3, size_t S4> ccl_device_inline const ssef set_sign_bit(const ssef &a) { - return a ^ cast(ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31)); + return cast(cast(a) ^ ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31)); } //////////////////////////////////////////////////////////////////////////////// |