svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Converter / BL_ShapeActionActuator.h
index d268eef6d23c73ae6372d2815a7fddf78daee007..890fe3f9de9dedecf0dd90ff9debcfbdeb3bd293 100644 (file)
@@ -50,9 +50,8 @@ public:
                                                short   playtype,
                                                short   blendin,
                                                short   priority,
-                                               float   stride,
-                                               PyTypeObject* T=&Type) 
-               : SCA_IActuator(gameobj,T),
+                                               float   stride) 
+               : SCA_IActuator(gameobj),
                
                m_lastpos(0, 0, 0),
                m_blendframe(0),
@@ -106,10 +105,6 @@ public:
        KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
        KX_PYMETHOD_DOC_VARARGS(BL_ShapeActionActuator,SetType);
 
-       virtual PyObject* py_getattro(PyObject* attr);
-       virtual PyObject*               py_getattro_dict();
-       virtual int py_setattro(PyObject* attr, PyObject* value);
-
        static PyObject*        pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);