[Bf-blender-cvs] [c9d9987] blender-v2.75-release: Fix T45269: Blender 2.75 crashes when I run my the game

Sybren A. Stüvel noreply at git.blender.org
Tue Jul 7 15:17:18 CEST 2015


Commit: c9d998707f97a579315dc33246d022e484ccb09e
Author: Sybren A. Stüvel
Date:   Thu Jul 2 12:05:38 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rBc9d998707f97a579315dc33246d022e484ccb09e

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 6fbd786..92bb0a1 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




More information about the Bf-blender-cvs mailing list