diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-27 03:20:31 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-27 03:20:31 +0400 |
| commit | 1e0cfcfd3af917a12402f955e6c80ea1b4999321 (patch) | |
| tree | c5886810ea9adc93bf639951e6d1cc55a168972c /extern/bullet2/src/BulletCollision | |
| parent | 17d9f2eda9ac03fa54c5a5788643aabfcec34bc7 (diff) | |
fixed some outstanding issues with Bullet soft bodies:
1) re-allocate a pool allocator, if one of the soft body collision algorithms is larger than max pool element size
2) manage child shapes properly, and call RemoveReferences on the m_sparsesdf
Diffstat (limited to 'extern/bullet2/src/BulletCollision')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h index 4f5af5f048c..df48ee95a18 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h @@ -48,6 +48,8 @@ struct btDefaultCollisionConstructionInfo class btDefaultCollisionConfiguration : public btCollisionConfiguration { +protected: + int m_persistentManifoldPoolSize; btStackAlloc* m_stackAlloc; @@ -56,6 +58,7 @@ class btDefaultCollisionConfiguration : public btCollisionConfiguration btPoolAllocator* m_persistentManifoldPool; bool m_ownsPersistentManifoldPool; + btPoolAllocator* m_collisionAlgorithmPool; bool m_ownsCollisionAlgorithmPool; |