diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
| commit | 54a55827ecee7f25d6a52255d8a639498a678fa6 (patch) | |
| tree | 6311657bfab7e75fa59e6828e0381bdcd4ec9eda /source/gameengine/Physics/Bullet/CcdPhysicsController.h | |
| parent | dff781c2a8c77f35fefe00b0a561235861d4d053 (diff) | |
| parent | 39acb4efa4c3f35806f5dc37124ff1028eb18215 (diff) | |
merging trunk 19093:19274etch-a-ton
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index c771aa2624b..deb3c0880e9 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -161,7 +161,7 @@ public: btTransform m_childTrans; btVector3 m_childScale; void* m_userData; - std::vector<btPoint3> m_vertexArray; // Contains both vertex array for polytope shape and + btAlignedObjectArray<btVector3> m_vertexArray; // Contains both vertex array for polytope shape and // triangle array for concave mesh shape. // In this case a triangle is made of 3 consecutive points std::vector<int> m_polygonIndexArray; // Contains the array of polygon index in the |