sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for recent Campbell's commit.

Browse Source
This commit is contained in:
Sergey Sharybin 2011-09-23 19:33:04 +00:00
parent a189b71a28
commit a043133bab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_navmesh.c
View File

@ -139,7 +139,7 @@ static void drawNavMeshColored(DerivedMesh *dm)
glEnable(GL_LIGHTING);
}
static void navDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, MCol *mcol, int matnr))
static void navDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
{
(void) setDrawOptions;

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -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);