[Bf-blender-cvs] [db8ccc1] master: Fix T45269: Blender 2.75 crashes when I run my the game

[Sybren A. Stüvel]

Commit: db8ccc18f7bfc97e8cd599cb42ce70e83f89d493
Author: Sybren A. Stüvel
Date:   Thu Jul 2 12:05:38 2015 +0200
Branches: master
https://developer.blender.org/rBdb8ccc18f7bfc97e8cd599cb42ce70e83f89d493

Fix T45269: Blender 2.75 crashes when I run my the game

Velocity clamping on static objects caused a crash.

===================================================================

M	source/gameengine/Physics/Bullet/CcdPhysicsController.cpp

===================================================================

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 692704b..8ecb586 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