diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-07-25 15:00:46 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-07-25 15:00:46 +0300 |
| commit | 38e19536bf6dd33cf73578260b17c5bc9d5db268 (patch) | |
| tree | 5666cbedec4e3d7ed75a2c22ae5e6c3e27f22d15 /source/gameengine/Physics | |
| parent | 04b3694d937d4b0a7b5936d193f110a72567b591 (diff) | |
Fix compile warning in 04b369
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 2c8b862a3a9..759e8bd6f7e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -2989,7 +2989,7 @@ float CcdPhysicsEnvironment::getAppliedImpulse(int constraintid) { // For soft body constraints if (constraintid == 0) - return NULL; + return 0.0f; int i; int numConstraints = m_dynamicsWorld->getNumConstraints(); |