From a043133bab034480f05eae16135560228e67fe30 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 23 Sep 2011 19:33:04 +0000 Subject: Fix for recent Campbell's commit. --- .../Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/gameengine/Rasterizer') diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index d9039a2a68d..d99a23c28b5 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -829,7 +829,7 @@ static int CheckTexfaceDM(void *mcol, int index) } */ -static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr) +static int CheckTexDM(MTFace *tface, int has_mcol, int matnr) { // index is the original face index, retrieve the polygon @@ -844,7 +844,7 @@ static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr) // don't use mcol return 2; } - if (!mcol) { + if (!has_mcol) { // we have to set the color from the material unsigned char rgba[4]; current_polymat->GetMaterialRGBAColor(rgba); -- cgit v1.2.3