archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Browse Source
This commit is contained in:
Andre Susano Pinto
2009-07-02 11:28:42 +00:00
parent 2acac0ff99
commit b14298f959
825 changed files with 14547 additions and 77617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/GameLogic/SCA_XNORController.h
View File

@@ -39,7 +39,7 @@ class SCA_XNORController : public SCA_IController
Py_Header;
//virtual void Trigger(class SCA_LogicManager* logicmgr);
public:
SCA_XNORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
SCA_XNORController(SCA_IObject* gameobj);
virtual ~SCA_XNORController();
virtual CValue* GetReplica();
virtual void Trigger(SCA_LogicManager* logicmgr);
@@ -48,9 +48,6 @@ public:
/* Python interface ---------------------------------------------------- */
/* --------------------------------------------------------------------- */
virtual PyObject* py_getattro(PyObject *attr);
virtual PyObject* py_getattro_dict();
};
#endif //__KX_XNORCONTROLLER