added some new Bullet files, and upgraded to latest Bullet 2.x

Please make sure to have extern/bullet/src/LinearMath/btAlignedAllocator.cpp in your build, if you add the files by name, instead of wildcard *.cpp

1 files changed, 2 insertions, 4 deletions

diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
index 171dcf33b15..1be03d70436 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
@@ -18,9 +18,8 @@ subject to the following restrictions:
 #define TRIANGLE_MESH_H
 
 #include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
-#include <vector>
 #include <LinearMath/btVector3.h>
-
+#include "LinearMath/btAlignedObjectArray.h"
 struct btMyTriangle
 {
 	btVector3	m_vert0;
@@ -31,8 +30,7 @@ struct btMyTriangle
 ///TriangleMesh provides storage for a concave triangle mesh. It can be used as data for the btTriangleMeshShape.
 class btTriangleMesh : public btStridingMeshInterface
 {
-	std::vector<btMyTriangle>	m_triangles;
-	
+	btAlignedObjectArray<btMyTriangle>	m_triangles;
 
 	public:
 		btTriangleMesh ();