diff options
author | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
---|---|---|
committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
commit | 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06 (patch) | |
tree | 33fa8c08a902176f4204b6cc6a18702997bd90ba /extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h | |
parent | 46d32c89f6df911120579d00dd6e1246536cb6d8 (diff) |
bullet: Update to current svn, r2636
Apply patches in patches directory, remove patches that were applied
upstream.
If you made changes without adding a patch, please check.
Fixes [#32233] exporting bullet format results in corrupt files.
Diffstat (limited to 'extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h')
-rw-r--r-- | extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h index 7d9092ce5b9..1c17ffcbb2b 100644 --- a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h +++ b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h @@ -19,7 +19,7 @@ subject to the following restrictions: #include "BulletSoftBody/btSoftBodySolvers.h" #include "btSoftBodySolverVertexBuffer.h" - +struct btCollisionObjectWrapper; class btDefaultSoftBodySolver : public btSoftBodySolver { @@ -54,7 +54,7 @@ public: virtual void copySoftBodyToVertexBuffer( const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer ); - virtual void processCollision( btSoftBody *, btCollisionObject* ); + virtual void processCollision( btSoftBody *, const btCollisionObjectWrapper* ); virtual void processCollision( btSoftBody*, btSoftBody* ); |