diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-03 14:55:46 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-03 14:55:46 +0400 |
commit | 85deff9c30acb7f40108ef446ccaad7348a1a2c0 (patch) | |
tree | 9b5d2b4d83fdbd87d06d311c5c9beeb5c537cb60 /extern/bullet2/src/LinearMath/btMinMax.h | |
parent | de493dacb32744f3c8c3019557dfa48fb6032e21 (diff) | |
parent | cfa07e8d2bdc0a8db15082a692ce25c2fb010ae6 (diff) |
svn merge -r 16334:16347 https://svn.blender.org/svnroot/bf-blender/trunk/blender + also added missing files from bullet-2.71alpha0 archiv + fixed compile errors
Diffstat (limited to 'extern/bullet2/src/LinearMath/btMinMax.h')
-rw-r--r-- | extern/bullet2/src/LinearMath/btMinMax.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extern/bullet2/src/LinearMath/btMinMax.h b/extern/bullet2/src/LinearMath/btMinMax.h index 1b8a3633f38..5e27d62a4a4 100644 --- a/extern/bullet2/src/LinearMath/btMinMax.h +++ b/extern/bullet2/src/LinearMath/btMinMax.h @@ -18,15 +18,15 @@ subject to the following restrictions: #define GEN_MINMAX_H template <class T> -SIMD_FORCE_INLINE const T& GEN_min(const T& a, const T& b) +SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) { - return b < a ? b : a; + return a < b ? a : b ; } template <class T> -SIMD_FORCE_INLINE const T& GEN_max(const T& a, const T& b) +SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) { - return a < b ? b : a; + return a > b ? a : b; } template <class T> @@ -36,7 +36,7 @@ SIMD_FORCE_INLINE const T& GEN_clamped(const T& a, const T& lb, const T& ub) } template <class T> -SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) +SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) { if (b < a) { @@ -45,7 +45,7 @@ SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) } template <class T> -SIMD_FORCE_INLINE void GEN_set_max(T& a, const T& b) +SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) { if (a < b) { |