diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-01-16 09:02:06 +0300 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-01-16 09:02:06 +0300 |
| commit | 3b91ea4309f47d937799382d988a6348e3bb2d7f (patch) | |
| tree | d45b8087e755ae6b9781845d21898603c038f2a7 /source/gameengine/Ketsji/KX_VertexProxy.cpp | |
| parent | 5fcf39d2a5db1d536e9fbfa52edb2bcdc40d8e29 (diff) | |
Unified KX_BlenderPolyMaterial & GPC_PolygonMaterial into KX_PolygonMaterial.
Make game engine materials use Zoffs in Materials.
Added Python material hooks.
Diffstat (limited to 'source/gameengine/Ketsji/KX_VertexProxy.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_VertexProxy.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp index 3afea847405..7683ce19f19 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.cpp +++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp @@ -338,6 +338,7 @@ PyObject* KX_VertexProxy::PySetRGBA(PyObject*, m_vertex->SetRGBA(MT_Vector4(r, g, b, a)); Py_Return; } + PyErr_Clear(); int rgba; if (PyArg_ParseTuple(args,"i",&rgba)) @@ -345,7 +346,8 @@ PyObject* KX_VertexProxy::PySetRGBA(PyObject*, m_vertex->SetRGBA(rgba); Py_Return; } - Py_Return; + + return NULL; } |