diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-02 02:16:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-02 02:19:09 +0300 |
| commit | fae710a2131f874da46b3a55ddb7da6884a47acb (patch) | |
| tree | 19fdaae1d81deefa162150cd01e5fa751ad025ab /extern/bullet2/src/LinearMath | |
| parent | 3b11acda7006b9cd836ed36f386100708ec4e5f6 (diff) | |
Fix T47293: game engine crashes since Bullet upgrade.
This restores a modification that was there before.
Diffstat (limited to 'extern/bullet2/src/LinearMath')
| -rw-r--r-- | extern/bullet2/src/LinearMath/btScalar.h | 2 | ||||
| -rw-r--r-- | extern/bullet2/src/LinearMath/btVector3.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h index 0bfd255bdb4..2e246760b82 100644 --- a/extern/bullet2/src/LinearMath/btScalar.h +++ b/extern/bullet2/src/LinearMath/btScalar.h @@ -179,7 +179,7 @@ inline int btGetVersion() #define BT_USE_SSE //BT_USE_SSE_IN_API is enabled on Mac OSX by default, because memory is automatically aligned on 16-byte boundaries //if apps run into issues, we will disable the next line - #define BT_USE_SSE_IN_API + //#define BT_USE_SSE_IN_API #ifdef BT_USE_SSE // include appropriate SSE level #if defined (__SSE4_1__) diff --git a/extern/bullet2/src/LinearMath/btVector3.cpp b/extern/bullet2/src/LinearMath/btVector3.cpp index e05bdccd67e..dbcf2b6ab57 100644 --- a/extern/bullet2/src/LinearMath/btVector3.cpp +++ b/extern/bullet2/src/LinearMath/btVector3.cpp @@ -15,9 +15,9 @@ This source version has been altered. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "btVector3.h" |