svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / BL_Shader.h
index 7db40e778ae6b0a3c4cfab9b968dc032dc8bcc86..42969996b3ec0b8e77ef5e9f154f0b338909b177 100644 (file)
@@ -120,7 +120,7 @@ private:
        void                    ClearUniforms();
 
 public:
-       BL_Shader(PyTypeObject *T=&Type);
+       BL_Shader();
        virtual ~BL_Shader();
 
        // Unused for now tangent is set as 
@@ -202,9 +202,7 @@ public:
        void SetUniform(int uniform, const int val);
 
        // Python interface
-       virtual PyObject* py_getattro(PyObject *attr);
-       virtual PyObject* py_getattro_dict();
-       virtual PyObject* py_repr(void) { return PyString_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
+       virtual PyObject* py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
 
        // -----------------------------------
        KX_PYMETHOD_DOC( BL_Shader, setSource );