svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / KX_Scene.h
index 79d3f7fd828bf8f0eba156a57d25220c80350814..2792f1f5fe4f6aff8454e0d9c2fc7a9827e3a6bb 100644 (file)
@@ -563,15 +563,7 @@ public:
        static PyObject*        pyattr_get_active_camera(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-       virtual PyObject* py_getattro(PyObject *attr); /* name, active_camera, gravity, suspended, viewport, framing, activity_culling, activity_culling_radius */
-       virtual PyObject* py_getattro_dict();
-       
-       virtual int py_setattro(PyObject *attr, PyObject *value);
-       virtual int py_delattro(PyObject *attr);
-       virtual PyObject* py_repr(void) { return PyString_FromString(GetName().ReadPtr()); }
-
-       PyObject* py_getattro__internal(PyObject *attr);
-       int py_setattro__internal(PyObject *attr, PyObject *pyvalue);
+       virtual PyObject* py_repr(void) { return PyUnicode_FromString(GetName().ReadPtr()); }
                
        /**
         * Sets the time the scene was suspended