summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-physics/bullet/files/bullet-2.77-gcc46.patch')
-rw-r--r--sci-physics/bullet/files/bullet-2.77-gcc46.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/sci-physics/bullet/files/bullet-2.77-gcc46.patch b/sci-physics/bullet/files/bullet-2.77-gcc46.patch
deleted file mode 100644
index 9ef054836e33..000000000000
--- a/sci-physics/bullet/files/bullet-2.77-gcc46.patch
+++ /dev/null
@@ -1,47 +0,0 @@
- src/BulletSoftBody/btSoftBody.h | 3 +++
- src/BulletSoftBody/btSoftBodyInternals.h | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h
-index 4d975b7..f781598 100644
---- a/src/BulletSoftBody/btSoftBody.h
-+++ b/src/BulletSoftBody/btSoftBody.h
-@@ -30,6 +30,7 @@ subject to the following restrictions:
- class btBroadphaseInterface;
- class btDispatcher;
-
-+class btSoftBodySolver;
-
- /* btSoftBodyWorldInfo */
- struct btSoftBodyWorldInfo
-@@ -52,6 +53,8 @@ class btSoftBody : public btCollisionObject
- public:
- btAlignedObjectArray<class btCollisionObject*> m_collisionDisabledObjects;
-
-+ // The solver object that handles this soft body
-+ btSoftBodySolver *m_softBodySolver;
- //
- // Enumerations
- //
-diff --git a/src/BulletSoftBody/btSoftBodyInternals.h b/src/BulletSoftBody/btSoftBodyInternals.h
-index 2cb7744..296d97a 100644
---- a/src/BulletSoftBody/btSoftBodyInternals.h
-+++ b/src/BulletSoftBody/btSoftBodyInternals.h
-@@ -26,6 +26,7 @@ subject to the following restrictions:
- #include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
- #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
-
-+#include <string.h> //for memset
- //
- // btSymMatrix
- //
-@@ -172,8 +173,7 @@ public:
- template <typename T>
- static inline void ZeroInitialize(T& value)
- {
-- static const T zerodummy;
-- value=zerodummy;
-+ memset(&value,0,sizeof(T));
- }
- //
- template <typename T>