diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-13 15:41:41 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-13 15:41:41 +0400 |
| commit | 5d5176095e82b34499e15d74f1fb76d56f4d9508 (patch) | |
| tree | dd8c61741160804873601f6b6350661132ac1b2f /source/gameengine/Ketsji | |
| parent | bcbf976b48762c2f25df470c6d13a124bc868a66 (diff) | |
| parent | 42ac7164e30dcca565253aa265201aad497e5360 (diff) | |
svn merge -r60422:60726 ^/trunk/blender
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index b3a38cb4f98..e5b8159753b 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -968,7 +968,7 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setTexture , "setTexture( index, tex)") return NULL; } -static unsigned int GL_array[11] = { +static const unsigned int GL_array[11] = { GL_ZERO, GL_ONE, GL_SRC_COLOR, |