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/common | |
| 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/common')
| -rw-r--r-- | source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index b1a0480ab14..d2574b3ca3b 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -188,6 +188,8 @@ class PHY_IPhysicsEnvironment virtual void ExportFile(const char* filename) {}; + virtual void MergeEnvironment(PHY_IPhysicsEnvironment *other_env) = 0; + #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IPhysicsEnvironment") |