diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-08 12:57:38 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-08 12:57:38 +0400 |
| commit | 2413523d6934e541e1d8f1c1511d87f606d539b9 (patch) | |
| tree | f850b40202b32071befb12ae8d087ced49331f8a /source/gameengine | |
| parent | 640b0adb9844f506ed68f99f8761a1f4daa288b0 (diff) | |
Compilation error fix for game engine caused by recent DM refactoring.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index f5787dad41e..7e9e3d9156c 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -828,7 +828,7 @@ static int CheckTexfaceDM(void *mcol, int index) } */ -static int CheckTexDM(MTFace *tface, int has_mcol, int matnr) +static DMDrawOption CheckTexDM(MTFace *tface, int has_mcol, int matnr) { // index is the original face index, retrieve the polygon @@ -836,23 +836,23 @@ static int CheckTexDM(MTFace *tface, int has_mcol, int matnr) (tface == NULL || tface->tpage == current_image)) { // must handle color. if (current_wireframe) - return 2; + return DM_DRAW_OPTION_NO_MCOL; if (current_ms->m_bObjectColor) { MT_Vector4& rgba = current_ms->m_RGBAcolor; glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]); // don't use mcol - return 2; + return DM_DRAW_OPTION_NO_MCOL; } if (!has_mcol) { // we have to set the color from the material unsigned char rgba[4]; current_polymat->GetMaterialRGBAColor(rgba); glColor4ubv((const GLubyte *)rgba); - return 2; + return DM_DRAW_OPTION_NO_MCOL; } - return 1; + return DM_DRAW_OPTION_NORMAL; } - return 0; + return DM_DRAW_OPTION_SKIP; } void RAS_OpenGLRasterizer::IndexPrimitivesInternal(RAS_MeshSlot& ms, bool multi) |