kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

small errors in touch sensor and gameObject

Browse Source
This commit is contained in:
Campbell Barton 2009-02-26 05:17:54 +00:00
parent f87194820b
commit 936a6eeda8
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@ -1170,7 +1170,7 @@ int KX_GameObject::_setattr(const char *attr, PyObject *value) // _setattr metho
{
if (!strcmp(attr, "parent")) {
PyErr_SetString(PyExc_AttributeError, "attribute \"mass\" is read only\nUse setParent()");
PyErr_SetString(PyExc_AttributeError, "attribute \"parent\" is read only\nUse setParent()");
return 1;
}

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

@ -284,6 +284,8 @@ PyAttributeDef KX_TouchSensor::Attributes[] = {
KX_PYATTRIBUTE_STRING_RW("propertyName",0,100,false,KX_TouchSensor,m_touchedpropname),
KX_PYATTRIBUTE_BOOL_RW("materialCheck",KX_TouchSensor,m_bFindMaterial),
KX_PYATTRIBUTE_BOOL_RW("pulseCollisions",KX_TouchSensor,m_bTouchPulse),
KX_PYATTRIBUTE_DUMMY("objectHit"),
KX_PYATTRIBUTE_DUMMY("objectHitList"),
{ NULL } //Sentinel
};
@ -309,15 +311,6 @@ int KX_TouchSensor::_setattr(const char *attr, PyObject *value)
if (ret >= 0)
return ret;
if (!strcmp(attr, "objectHit")) {
PyErr_SetString(PyExc_AttributeError, "attribute \"objectHit\" is read only");
return 1;
}
if (!strcmp(attr, "objectHitList")) {
PyErr_SetString(PyExc_AttributeError, "attribute \"objectHit\" is read only");
return 1;
}
return SCA_ISensor::_setattr(attr, value);
}