svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / KX_RaySensor.cpp
index 78a61e9d95e31a38d959fb2d930f463b784ad34c..3f27496df71217e7b1153c5e7a9fc98b19e7480c 100644 (file)
@@ -55,9 +55,8 @@ KX_RaySensor::KX_RaySensor(class SCA_EventManager* eventmgr,
                                        bool bXRay,
                                        double distance,
                                        int axis,
-                                       KX_Scene* ketsjiScene,
-                                       PyTypeObject* T)
-                       : SCA_ISensor(gameobj,eventmgr, T),
+                                       KX_Scene* ketsjiScene)
+                       : SCA_ISensor(gameobj,eventmgr),
                                        m_propertyname(propname),
                                        m_bFindMaterial(bFindMaterial),
                                        m_bXRay(bXRay),
@@ -336,20 +335,16 @@ PyTypeObject KX_RaySensor::Type = {
        0,
        0,
        py_base_repr,
-       0,0,0,0,0,0,
-       py_base_getattro,
-       py_base_setattro,
        0,0,0,0,0,0,0,0,0,
-       Methods
-
-};
-
-PyParentObject KX_RaySensor::Parents[] = {
-       &KX_RaySensor::Type,
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+       0,0,0,0,0,0,0,
+       Methods,
+       0,
+       0,
        &SCA_ISensor::Type,
-       &SCA_ILogicBrick::Type,
-       &CValue::Type,
-       NULL
+       0,0,0,0,0,0,
+       py_base_new
+
 };
 
 PyMethodDef KX_RaySensor::Methods[] = {
@@ -447,18 +442,4 @@ PyObject* KX_RaySensor::PyGetHitNormal()
        return retVal;
 }
 
-
-
-PyObject* KX_RaySensor::py_getattro(PyObject *attr) {
-       py_getattro_up(SCA_ISensor);
-}
-
-PyObject* KX_RaySensor::py_getattro_dict() {
-       py_getattro_dict_up(SCA_ISensor);
-}
-
-int KX_RaySensor::py_setattro(PyObject *attr, PyObject *value) {
-       py_setattro_up(SCA_ISensor);
-}
-
 // <----- Deprecated