diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2015-07-02 13:05:38 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2015-07-02 13:05:49 +0300 |
| commit | db8ccc18f7bfc97e8cd599cb42ce70e83f89d493 (patch) | |
| tree | 75396c8fffd2d4ecf98c0e7202ddf9df0cd8c770 | |
| parent | e80e4c937bd20132bec52181dfa16be6883b5802 (diff) | |
Fix T45269: Blender 2.75 crashes when I run my the game
Velocity clamping on static objects caused a crash.
| -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 692704b5080..8ecb586f77e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -700,7 +700,7 @@ CcdPhysicsController::~CcdPhysicsController() void CcdPhysicsController::SimulationTick(float timestep) { btRigidBody *body = GetRigidBody(); - if (!body && body->isStaticObject()) + if (!body || body->isStaticObject()) return; // Clamp linear velocity |