bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benoit Bolsee 2009-02-15 19:07:27 +00:00
parent b052ae4cdb
commit 915baae622
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gameengine/Ketsji/KX_TouchSensor.cpp
View File

@ -100,8 +100,8 @@ m_eventmgr(eventmgr)
m_colliders = new CListValue(); m_colliders = new CListValue();
KX_ClientObjectInfo *client_info = gameobj->getClientInfo(); KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
client_info->m_gameobject = gameobj; //client_info->m_gameobject = gameobj;
client_info->m_auxilary_info = NULL; //client_info->m_auxilary_info = NULL;
client_info->m_sensors.push_back(this); client_info->m_sensors.push_back(this);
m_physCtrl = dynamic_cast<PHY_IPhysicsController*>(gameobj->GetPhysicsController()); m_physCtrl = dynamic_cast<PHY_IPhysicsController*>(gameobj->GetPhysicsController());
@ -143,8 +143,8 @@ void KX_TouchSensor::ReParent(SCA_IObject* parent)
// m_solidHandle = m_sumoObj->getObjectHandle(); // m_solidHandle = m_sumoObj->getObjectHandle();
KX_ClientObjectInfo *client_info = gameobj->getClientInfo(); KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
client_info->m_gameobject = gameobj; //client_info->m_gameobject = gameobj;
client_info->m_auxilary_info = NULL; //client_info->m_auxilary_info = NULL;
client_info->m_sensors.push_back(this); client_info->m_sensors.push_back(this);
SCA_ISensor::ReParent(parent); SCA_ISensor::ReParent(parent);
@ -354,7 +354,7 @@ PyObject* KX_TouchSensor::PyGetHitObjectList(PyObject* self,
if (spc) { if (spc) {
KX_ClientObjectInfo* cl_inf = static_cast<KX_ClientObjectInfo*>(spc->getNewClientInfo()); 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()); newList->Add(m_colliders->GetValue(i)->AddRef());
} }
} }