svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / GameLogic / SCA_NANDController.h
index 0ae0ff19745ab6e5ca4c1cbae3529a292d540e24..36a145e5f2b114093f1d6de1c729173f1d77ae07 100644 (file)
@@ -39,7 +39,7 @@ class SCA_NANDController : public SCA_IController
        Py_Header;
        //virtual void Trigger(class SCA_LogicManager* logicmgr);
 public:
-       SCA_NANDController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+       SCA_NANDController(SCA_IObject* gameobj);
        virtual ~SCA_NANDController();
        virtual CValue* GetReplica();
        virtual void Trigger(SCA_LogicManager* logicmgr);
@@ -47,10 +47,6 @@ public:
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
-
-       virtual PyObject* py_getattro(PyObject *attr);
-       virtual PyObject* py_getattro_dict();
-
 };
 
 #endif //__KX_NANDCONTROLLER