Commit: a21caf32ccb3379cae93ec8062daf0b258014027
Author: Campbell Barton
Date: Tue Jun 17 22:04:20 2014 +1000
https://developer.blender.org/rBa21caf32ccb3379cae93ec8062daf0b258014027
Fix for bad NULL check
===================================================================
M source/gameengine/Ketsji/KX_TouchEventManager.cpp
===================================================================
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 40e5eb0..7ec379e 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -85,7 +85,7 @@ bool KX_TouchEventManager::newBroadphaseResponse(void
*client_data,
PHY_IPhysicsController* ctrl2 =
static_cast<PHY_IPhysicsController*>(object2);
KX_ClientObjectInfo *info1 = (ctrl1) ?
static_cast<KX_ClientObjectInfo*>(ctrl1->GetNewClientInfo()) : NULL;
- KX_ClientObjectInfo *info2 = (ctrl1) ?
static_cast<KX_ClientObjectInfo*>(ctrl2->GetNewClientInfo()) : NULL;
+ KX_ClientObjectInfo *info2 = (ctrl2) ?
static_cast<KX_ClientObjectInfo*>(ctrl2->GetNewClientInfo()) : NULL;
// This call back should only be called for controllers of Near and
Radar sensor
if (!info1)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
