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

Merged changes in the trunk up to revision 50829.

Browse Source 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
This commit is contained in:
Tamito Kajiyama
2012-09-23 18:50:56 +00:00
parent 7afbdff1b6 a73dd3476e
commit a42ba82f63
1024 changed files with 399537 additions and 14461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@ class SCA_PythonController : public SCA_IController
//for debugging
//virtual CValue* AddRef();
//virtual int Release(); // Release a reference to this value (when reference count reaches 0, the value is removed from the heap)
//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);
virtual ~SCA_PythonController();
@@ -96,11 +96,11 @@ class SCA_PythonController : public SCA_IController
void ErrorPrint(const char *error_msg);
#ifdef WITH_PYTHON
static const char* sPyGetCurrentController__doc__;
static PyObject* sPyGetCurrentController(PyObject* self);
static const char* sPyAddActiveActuator__doc__;
static PyObject* sPyAddActiveActuator(PyObject* self,
PyObject* args);
static const char *sPyGetCurrentController__doc__;
static PyObject *sPyGetCurrentController(PyObject *self);
static const char *sPyAddActiveActuator__doc__;
static PyObject *sPyAddActiveActuator(PyObject *self,
PyObject *args);
static SCA_IActuator* LinkedActuatorFromPy(PyObject *value);