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

33
source/gameengine/GameLogic/SCA_ANDController.cpp
View File

@@ -42,9 +42,10 @@
/* Native functions */
/* ------------------------------------------------------------------------- */
SCA_ANDController::SCA_ANDController(SCA_IObject* gameobj)
SCA_ANDController::SCA_ANDController(SCA_IObject* gameobj,
PyTypeObject* T)
:
SCA_IController(gameobj)
SCA_IController(gameobj,T)
{
}
@@ -115,15 +116,19 @@ PyTypeObject SCA_ANDController::Type = {
0,
0,
py_base_repr,
0,0,0,0,0,0,0,0,0,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
0,0,0,0,0,0,0,
Methods,
0,
0,
&SCA_IController::Type,
0,0,0,0,0,0,
py_base_new
py_base_getattro,
py_base_setattro,
0,0,0,0,0,0,0,0,0,
Methods
};
PyParentObject SCA_ANDController::Parents[] = {
&SCA_ANDController::Type,
&SCA_IController::Type,
&SCA_ILogicBrick::Type,
&CValue::Type,
NULL
};
PyMethodDef SCA_ANDController::Methods[] = {
@@ -134,4 +139,12 @@ PyAttributeDef SCA_ANDController::Attributes[] = {
{ NULL } //Sentinel
};
PyObject* SCA_ANDController::py_getattro(PyObject *attr) {
py_getattro_up(SCA_IController);
}
PyObject* SCA_ANDController::py_getattro_dict() {
py_getattro_dict_up(SCA_IController);
}
/* eof */