diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-21 20:28:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-21 20:28:19 +0400 |
| commit | 6f73e351ee2f5e8dbdd867d160549bd9304865d2 (patch) | |
| tree | 8552c640bb4cbbe60539b0efa5a217406be78f87 /intern/cycles/util | |
| parent | 3c32e07d7c7c6b7a066e512ec5f75e96c1c2f7e4 (diff) | |
Cycles:
* Fix #29354: crash on branch file. Note that for best compatibility, you need
to save your files with one of the latest branch builds, since not all version
patching code was moved to trunk.
* Rename "Cycles" to "Cycles Render" in info header menu.
* Code tweaks to try to fix #29301. It's not a real solution though, I'm thinking
cause is extended precision for floats on some cpu's, used in one case but not
in the other, leading to bounding box intersection issue...
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index c0dd627a606..2f9e00dbfcb 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -115,12 +115,12 @@ __device_inline double min(double a, double b) __device_inline float min4(float a, float b, float c, float d) { - return min(min(min(a, b), c), d); + return min(min(a, b), min(c, d)); } __device_inline float max4(float a, float b, float c, float d) { - return max(max(max(a, b), c), d); + return max(max(a, b), max(c, d)); } #ifndef __KERNEL_OPENCL__ |