[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19124] trunk/blender/source/gameengine/ Ketsji: small errors in touch sensor and gameObject
Campbell Barton
ideasman42 at gmail.com
Thu Feb 26 06:17:57 CET 2009
Revision: 19124
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19124
Author: campbellbarton
Date: 2009-02-26 06:17:54 +0100 (Thu, 26 Feb 2009)
Log Message:
-----------
small errors in touch sensor and gameObject
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2009-02-26 04:40:00 UTC (rev 19123)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2009-02-26 05:17:54 UTC (rev 19124)
@@ -1170,7 +1170,7 @@
{
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;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp 2009-02-26 04:40:00 UTC (rev 19123)
+++ trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp 2009-02-26 05:17:54 UTC (rev 19124)
@@ -284,6 +284,8 @@
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 @@
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);
}
More information about the Bf-blender-cvs
mailing list