diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-06-16 13:16:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-06-16 13:16:04 +0400 |
| commit | 9b69c569178e118e1e2486f167164673a4201be0 (patch) | |
| tree | 613681edfc177f6004bcf0e60f86aca1078ab4c1 /source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | |
| parent | f445dfbfb6113c0465491a5e1c275e81b602cc58 (diff) | |
Material color was always overriding OBCOL for blender text.
Diffstat (limited to 'source/gameengine/BlenderRoutines/KX_BlenderGL.cpp')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 7c9dbcdaab2..2a5cc14018f 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -133,7 +133,12 @@ void BL_RenderText(int mode,const char* textstr,int textlen,struct MTFace* tface characters = 0; } - if(!col) glColor3f(1.0f, 1.0f, 1.0f); + /* When OBCOL flag is on the color is set in IndexPrimitives_3DText */ + if (tface->mode & TF_OBCOL) { /* Color has been set */ + col= NULL; + } else { + if(!col) glColor3f(1.0f, 1.0f, 1.0f); + } glPushMatrix(); for (index = 0; index < characters; index++) { |