[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19971] trunk/blender: remove uneeded checks and testMethod from KX_ConstraintWrapper, typo in import_obj
Campbell Barton
ideasman42 at gmail.com
Wed Apr 29 12:24:12 CEST 2009
Revision: 19971
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19971
Author: campbellbarton
Date: 2009-04-29 12:24:12 +0200 (Wed, 29 Apr 2009)
Log Message:
-----------
remove uneeded checks and testMethod from KX_ConstraintWrapper, typo in import_obj
Modified Paths:
--------------
trunk/blender/release/scripts/import_obj.py
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
Modified: trunk/blender/release/scripts/import_obj.py
===================================================================
--- trunk/blender/release/scripts/import_obj.py 2009-04-29 10:06:38 UTC (rev 19970)
+++ trunk/blender/release/scripts/import_obj.py 2009-04-29 10:24:12 UTC (rev 19971)
@@ -587,7 +587,7 @@
# so we need to know weather
multi_line_face= False
- print '\tpassing obj file "%s"...' % filepath,
+ print '\tparsing obj file "%s"...' % filepath,
time_sub= sys.time()
file= open(filepath, 'rU')
for line in file: #.xreadlines():
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2009-04-29 10:06:38 UTC (rev 19970)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2009-04-29 10:24:12 UTC (rev 19971)
@@ -48,20 +48,12 @@
KX_ConstraintWrapper::~KX_ConstraintWrapper()
{
}
-//python integration methods
-PyObject* KX_ConstraintWrapper::PyTestMethod(PyObject* args, PyObject* kwds)
-{
- Py_RETURN_NONE;
-}
PyObject* KX_ConstraintWrapper::PyGetConstraintId(PyObject* args, PyObject* kwds)
{
return PyInt_FromLong(m_constraintId);
}
-
-
-
//python specific stuff
PyTypeObject KX_ConstraintWrapper::Type = {
PyObject_HEAD_INIT(NULL)
@@ -97,35 +89,13 @@
py_getattro_dict_up(PyObjectPlus);
}
-int KX_ConstraintWrapper::py_setattro(PyObject *attr,PyObject* pyobj)
+int KX_ConstraintWrapper::py_setattro(PyObject *attr,PyObject* value)
{
- int result = 1;
- /* what the heck is this supposed to do?, needs attention */
- if (PyList_Check(pyobj))
- {
- result = 0;
- }
- if (PyFloat_Check(pyobj))
- {
- result = 0;
-
- }
- if (PyInt_Check(pyobj))
- {
- result = 0;
- }
- if (PyString_Check(pyobj))
- {
- result = 0;
- }
- if (result)
- result = PyObjectPlus::py_setattro(attr,pyobj);
- return result;
+ py_setattro_up(PyObjectPlus);
};
PyMethodDef KX_ConstraintWrapper::Methods[] = {
- {"testMethod",(PyCFunction) KX_ConstraintWrapper::sPyTestMethod, METH_VARARGS},
{"getConstraintId",(PyCFunction) KX_ConstraintWrapper::sPyGetConstraintId, METH_VARARGS},
{NULL,NULL} //Sentinel
};
More information about the Bf-blender-cvs
mailing list