From fae710a2131f874da46b3a55ddb7da6884a47acb Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 2 Feb 2016 00:16:31 +0100 Subject: Fix T47293: game engine crashes since Bullet upgrade. This restores a modification that was there before. --- extern/bullet2/patches/blender.patch | 98 ++++++++++++++++++++++ .../CollisionShapes/btConvexHullShape.cpp | 6 +- .../CollisionShapes/btConvexShape.cpp | 6 +- .../CollisionShapes/btMultiSphereShape.cpp | 6 +- .../CollisionShapes/btPolyhedralConvexShape.cpp | 6 +- extern/bullet2/src/LinearMath/btScalar.h | 2 +- extern/bullet2/src/LinearMath/btVector3.cpp | 6 +- 7 files changed, 114 insertions(+), 16 deletions(-) (limited to 'extern') diff --git a/extern/bullet2/patches/blender.patch b/extern/bullet2/patches/blender.patch index d8e52ec32e8..6bbb683a740 100644 --- a/extern/bullet2/patches/blender.patch +++ b/extern/bullet2/patches/blender.patch @@ -148,3 +148,101 @@ index 7240ac4..6871ce8 100644 // Edges of the output hull btAlignedObjectArray edges; +diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +index 0623e35..02ea503 100644 +--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp ++++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +@@ -13,9 +13,9 @@ subject to the following restrictions: + 3. This notice may not be removed or altered from any source distribution. + */ + +-#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 "btConvexHullShape.h" + #include "BulletCollision/CollisionShapes/btCollisionMargin.h" +diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp +index b56d729..88018b4 100644 +--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp ++++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp +@@ -13,9 +13,9 @@ subject to the following restrictions: + 3. This notice may not be removed or altered from any source distribution. + */ + +-#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 "btConvexShape.h" + #include "btTriangleShape.h" +diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +index a7362ea..6abfdff 100644 +--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp ++++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +@@ -13,9 +13,9 @@ subject to the following restrictions: + 3. This notice may not be removed or altered from any source distribution. + */ + +-#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 "btMultiSphereShape.h" + #include "BulletCollision/CollisionShapes/btCollisionMargin.h" +diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +index 4854f37..9095c59 100644 +--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp ++++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +@@ -12,9 +12,9 @@ subject to the following restrictions: + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ +-#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 "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" + #include "btConvexPolyhedron.h" +diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h +index 0bfd255..2e24676 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 e05bdcc..dbcf2b6 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" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp index 0623e351a97..02ea5033b15 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#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 "btConvexHullShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp index b56d72917de..88018b4c624 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#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 "btConvexShape.h" #include "btTriangleShape.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index a7362ea01f4..6abfdffa677 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#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 "btMultiSphereShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp index 4854f370f73..9095c592d87 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp @@ -12,9 +12,9 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#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 "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "btConvexPolyhedron.h" 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" -- cgit v1.2.3