diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 01:08:49 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 01:08:49 +0400 |
| commit | 3442a658fc24267d0fd77da72eb7b254e7079c65 (patch) | |
| tree | d8649018b7af808662672a4dab30c4d206b7f2b7 /source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | |
| parent | 81e28b8802a65a3efd6410e75a3fb92a21ed69a3 (diff) | |
BGE Cleanup: Reducing KX_Scene's dependence on Bullet.
Instead, it now relies more on our physics abstractions (e.g.,
PHY_IPhysicsEnvironment).
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h')
| -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 0e8ac9417f0..4e002f5ce3c 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -258,7 +258,7 @@ protected: class btConstraintSolver* GetConstraintSolver(); - void MergeEnvironment(CcdPhysicsEnvironment *other); + void MergeEnvironment(PHY_IPhysicsEnvironment *other_env); protected: |