diff options
Diffstat (limited to 'extern/bullet2/patches')
| -rw-r--r-- | extern/bullet2/patches/make_id.patch | 42 | ||||
| -rw-r--r-- | extern/bullet2/patches/pvs_warning_fixes.patch | 31 |
2 files changed, 0 insertions, 73 deletions
diff --git a/extern/bullet2/patches/make_id.patch b/extern/bullet2/patches/make_id.patch deleted file mode 100644 index 959e578ad0e..00000000000 --- a/extern/bullet2/patches/make_id.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: src/LinearMath/btSerializer.h -=================================================================== ---- src/LinearMath/btSerializer.h (revision 46625) -+++ src/LinearMath/btSerializer.h (working copy) -@@ -106,23 +106,23 @@ - - #define BT_HEADER_LENGTH 12 - #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) --# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) -+# define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) - #else --# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) -+# define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) - #endif - --#define BT_SOFTBODY_CODE MAKE_ID('S','B','D','Y') --#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J') --#define BT_RIGIDBODY_CODE MAKE_ID('R','B','D','Y') --#define BT_CONSTRAINT_CODE MAKE_ID('C','O','N','S') --#define BT_BOXSHAPE_CODE MAKE_ID('B','O','X','S') --#define BT_QUANTIZED_BVH_CODE MAKE_ID('Q','B','V','H') --#define BT_TRIANLGE_INFO_MAP MAKE_ID('T','M','A','P') --#define BT_SHAPE_CODE MAKE_ID('S','H','A','P') --#define BT_ARRAY_CODE MAKE_ID('A','R','A','Y') --#define BT_SBMATERIAL_CODE MAKE_ID('S','B','M','T') --#define BT_SBNODE_CODE MAKE_ID('S','B','N','D') --#define BT_DNA_CODE MAKE_ID('D','N','A','1') -+#define BT_SOFTBODY_CODE BT_MAKE_ID('S','B','D','Y') -+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J') -+#define BT_RIGIDBODY_CODE BT_MAKE_ID('R','B','D','Y') -+#define BT_CONSTRAINT_CODE BT_MAKE_ID('C','O','N','S') -+#define BT_BOXSHAPE_CODE BT_MAKE_ID('B','O','X','S') -+#define BT_QUANTIZED_BVH_CODE BT_MAKE_ID('Q','B','V','H') -+#define BT_TRIANLGE_INFO_MAP BT_MAKE_ID('T','M','A','P') -+#define BT_SHAPE_CODE BT_MAKE_ID('S','H','A','P') -+#define BT_ARRAY_CODE BT_MAKE_ID('A','R','A','Y') -+#define BT_SBMATERIAL_CODE BT_MAKE_ID('S','B','M','T') -+#define BT_SBNODE_CODE BT_MAKE_ID('S','B','N','D') -+#define BT_DNA_CODE BT_MAKE_ID('D','N','A','1') - - - struct btPointerUid diff --git a/extern/bullet2/patches/pvs_warning_fixes.patch b/extern/bullet2/patches/pvs_warning_fixes.patch deleted file mode 100644 index 5a3fe140454..00000000000 --- a/extern/bullet2/patches/pvs_warning_fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h -=================================================================== ---- extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45907) -+++ extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45908) -@@ -45,7 +45,9 @@ - int getTriangleIndex() const - { - // Get only the lower bits where the triangle index is stored -- return (m_PartIdTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS))); -+ unsigned int x = 0; -+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS); -+ return (m_PartIdTriangleIndex&~(y)); - } - int getPartId() const - { -Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h -=================================================================== ---- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45907) -+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45908) -@@ -78,8 +78,10 @@ - int getTriangleIndex() const - { - btAssert(isLeafNode()); -+ unsigned int x=0; -+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS); - // Get only the lower bits where the triangle index is stored -- return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS))); -+ return (m_escapeIndexOrTriangleIndex&~(y)); - } - int getPartId() const - { |