[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18985] trunk/blender/source/gameengine/ Ketsji/KX_TouchSensor.cpp: BGE bug #18137 fixed: When two actors collide in this blend file the blender crashes.

[Benoit Bolsee]

Revision: 18985
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18985
Author:   ben2610
Date:     2009-02-15 20:07:27 +0100 (Sun, 15 Feb 2009)

Log Message:
-----------
BGE bug #18137 fixed: When two actors collide in this blend file the blender crashes.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp	2009-02-15 17:24:09 UTC (rev 18984)
+++ trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp	2009-02-15 19:07:27 UTC (rev 18985)
@@ -100,8 +100,8 @@
 	m_colliders = new CListValue();
 	
 	KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
-	client_info->m_gameobject = gameobj;
-	client_info->m_auxilary_info = NULL;
+	//client_info->m_gameobject = gameobj;
+	//client_info->m_auxilary_info = NULL;
 	client_info->m_sensors.push_back(this);
 	
 	m_physCtrl = dynamic_cast<PHY_IPhysicsController*>(gameobj->GetPhysicsController());
@@ -143,8 +143,8 @@
 	
 //	m_solidHandle = m_sumoObj->getObjectHandle();
 	KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
-	client_info->m_gameobject = gameobj;
-	client_info->m_auxilary_info = NULL;
+	//client_info->m_gameobject = gameobj;
+	//client_info->m_auxilary_info = NULL;
 	
 	client_info->m_sensors.push_back(this);
 	SCA_ISensor::ReParent(parent);
@@ -354,7 +354,7 @@
 				if (spc) {
 					KX_ClientObjectInfo* cl_inf = static_cast<KX_ClientObjectInfo*>(spc->getNewClientInfo());
 					
-					if (m_touchedpropname == ((char*)cl_inf->m_auxilary_info)) {
+					if (NULL != cl_inf->m_auxilary_info && m_touchedpropname == ((char*)cl_inf->m_auxilary_info)) {
 						newList->Add(m_colliders->GetValue(i)->AddRef());
 					} 
 				}