diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-07 15:09:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:09:02 -0300 |
| commit | ec4b8e4a5a96457ef5f88f87205363b86b7c7615 (patch) | |
| tree | 7a984cec670365b967671afdccb4de41aaad4c5b /thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h | |
| parent | 6ce9951d9e487cfacec40ea27e2a2be241d9da77 (diff) | |
| parent | 6142448417f4e15bf0bc0c94df7d1862a790e3c7 (diff) | |
Merge pull request #21836 from AndreaCatania/bulletUpdate
Update bullet to Master 12409f1118a7c7a266f9071350c70789dfe73bb9
Diffstat (limited to 'thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h index eede2b28ca..886476e8ad 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -107,6 +107,9 @@ protected: void serializeCollisionObjects(btSerializer* serializer); + void serializeContactManifolds(btSerializer* serializer); + + public: //this constructor doesn't own the dispatcher and paircache/broadphase |