diff options
Diffstat (limited to 'source/gameengine/Rasterizer')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/SConscript | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 23e0a50ed6f..55f36dcd772 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -783,7 +783,7 @@ static int CheckTexfaceDM(void *mcol, int index) } */ -static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr) +static int CheckTexDM(MTFace *tface, int has_vcol, int matnr) { // index is the original face index, retrieve the polygon @@ -798,7 +798,7 @@ static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr) // don't use mcol return 2; } - if (!mcol) { + if (!has_vcol) { // we have to set the color from the material unsigned char rgba[4]; current_polymat->GetMaterialRGBAColor(rgba); diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index 4164271ba9b..2db42f8285f 100644 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -12,6 +12,7 @@ if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') + if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') |