svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / GameLogic / SCA_JoystickSensor.h
index e6a1d2eef32e25bc8edb9cafabe3844e9136fed7..32f8ce567d28580161b2302591bc911546a8583d 100644 (file)
@@ -106,8 +106,7 @@ public:
                                           short int joymode,
                                           int axis, int axisf,int prec,
                                           int button,
-                                          int hat, int hatf, bool allevents,
-                                          PyTypeObject* T=&Type );
+                                          int hat, int hatf, bool allevents);
        virtual ~SCA_JoystickSensor();
        virtual CValue* GetReplica();
        
@@ -123,10 +122,6 @@ public:
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
 
-       virtual PyObject* py_getattro(PyObject *attr);
-       virtual PyObject* py_getattro_dict();
-       virtual int py_setattro(PyObject *attr, PyObject *value);
-
        /* Joystick Index */
        KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetIndex);
        KX_PYMETHOD_DOC_O(SCA_JoystickSensor,SetIndex);