diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
| commit | 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c (patch) | |
| tree | 02be093686847beb79d430a197ae09b4b1055a69 /extern/bullet2/src/LinearMath/btScalar.h | |
| parent | 66577c8732f4957e4afa5cafb18259ea589e74b6 (diff) | |
| parent | 81060ff6b26c22331d2066bb83d492bbe61e936c (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'extern/bullet2/src/LinearMath/btScalar.h')
| -rw-r--r-- | extern/bullet2/src/LinearMath/btScalar.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h index 0bfd255bdb4..898669f86e2 100644 --- a/extern/bullet2/src/LinearMath/btScalar.h +++ b/extern/bullet2/src/LinearMath/btScalar.h @@ -16,6 +16,9 @@ subject to the following restrictions: #ifndef BT_SCALAR_H #define BT_SCALAR_H +#if defined(_MSC_VER) && defined(__clang__) /* clang supplies it's own overloads already */ +#define BT_NO_SIMD_OPERATOR_OVERLOADS +#endif #ifdef BT_MANAGED_CODE //Aligned data types not supported in managed code @@ -83,7 +86,7 @@ inline int btGetVersion() #ifdef BT_USE_SSE #if (_MSC_FULL_VER >= 170050727)//Visual Studio 2012 can compile SSE4/FMA3 (but SSE4/FMA3 is not enabled by default) - #define BT_ALLOW_SSE4 + //#define BT_ALLOW_SSE4 //disable this cause blender targets sse2 #endif //(_MSC_FULL_VER >= 160040219) //BT_USE_SSE_IN_API is disabled under Windows by default, because @@ -102,7 +105,7 @@ inline int btGetVersion() #endif //__MINGW32__ #ifdef BT_DEBUG - #ifdef _MSC_VER + #if defined(_MSC_VER) && !defined(__clang__) #include <stdio.h> #define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u ("#x")\n", __LINE__);__debugbreak(); }} #else//_MSC_VER |