diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
| commit | ad1d3dd30fa5f4c33279679e3824899fd18801b8 (patch) | |
| tree | cef4de1e42c5a8a2a1f68719452891c19a065ab7 /source/gameengine/Physics/Bullet | |
| parent | 77a7ec7c61965efa9e2e82894c821fe5c937b989 (diff) | |
| parent | 1bdf652b89871614c38bf2146cf94522c3347e06 (diff) | |
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
Diffstat (limited to 'source/gameengine/Physics/Bullet')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 8f6e463bd3f..cc2e59be02c 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -767,7 +767,7 @@ void CcdPhysicsController::SetPhysicsEnvironment(class PHY_IPhysicsEnvironment * if (m_cci.m_physicsEnv != physicsEnv) { // since the environment is changing, we must also move the controler to the - // new environement. Note that we don't handle sensor explicitely: this + // new environment. Note that we don't handle sensor explicitly: this // function can be called on sensor but only when they are not registered if (m_cci.m_physicsEnv->removeCcdPhysicsController(this)) { |