diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
| commit | aa6d7ebd145ff375a9dc876d33065f80d94accca (patch) | |
| tree | 4c9562c2575294c94bd55cb4b3bd25a9e7e793b6 /source/gameengine/Physics/Bullet | |
| parent | 9d0186fc6a5aa0aab36b9a1f52e3cd5e1ac46767 (diff) | |
| parent | 8714fb7019e853703ce8b102edac43d84b7bbe14 (diff) | |
svn merge ^/trunk/blender -r40720:40872
Diffstat (limited to 'source/gameengine/Physics/Bullet')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index c34a00513bf..1eed0665564 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -66,7 +66,7 @@ protected: btIDebugDraw* m_debugDrawer; class btDefaultCollisionConfiguration* m_collisionConfiguration; - class btBroadphaseInterface* m_broadphase; // broadphase for dynamic world + class btBroadphaseInterface* m_broadphase; // broadphase for dynamic world // for culling only btOverlappingPairCache* m_cullingCache; struct btDbvtBroadphase* m_cullingTree; // broadphase for culling |