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

Reverted incorrect merge (missing files)

Browse Source 
svn up -r 21247
svn merge -r 21247:21246 . (<= revert incorrect: merge -r 21041:21243)
svn up
This commit is contained in:
Andre Susano Pinto
2009-07-02 02:59:43 +00:00
parent 1b557a61a5 84cd5a6cfb
commit 2acac0ff99
783 changed files with 75745 additions and 9862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/GameLogic/SCA_PythonController.h
View File

@@ -72,7 +72,7 @@ class SCA_PythonController : public SCA_IController
//virtual CValue* AddRef();
//virtual int Release(); // Release a reference to this value (when reference count reaches 0, the value is removed from the heap)
SCA_PythonController(SCA_IObject* gameobj, int mode);
SCA_PythonController(SCA_IObject* gameobj, int mode, PyTypeObject* T = &Type);
virtual ~SCA_PythonController();
virtual CValue* GetReplica();
@@ -96,6 +96,10 @@ class SCA_PythonController : public SCA_IController
static PyObject* sPyAddActiveActuator(PyObject* self,
PyObject* args);
static SCA_IActuator* LinkedActuatorFromPy(PyObject *value);
virtual PyObject* py_getattro(PyObject *attr);
virtual PyObject* py_getattro_dict();
virtual int py_setattro(PyObject *attr, PyObject *value);
KX_PYMETHOD_O(SCA_PythonController,Activate);