forked from bartvdbraak/blender
Fix for recent Campbell's commit.
This commit is contained in:
parent
a189b71a28
commit
a043133bab
@ -139,7 +139,7 @@ static void drawNavMeshColored(DerivedMesh *dm)
|
|||||||
glEnable(GL_LIGHTING);
|
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;
|
(void) setDrawOptions;
|
||||||
|
|
||||||
|
@ -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
|
// 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
|
// don't use mcol
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
if (!mcol) {
|
if (!has_mcol) {
|
||||||
// we have to set the color from the material
|
// we have to set the color from the material
|
||||||
unsigned char rgba[4];
|
unsigned char rgba[4];
|
||||||
current_polymat->GetMaterialRGBAColor(rgba);
|
current_polymat->GetMaterialRGBAColor(rgba);
|
||||||
|
Loading…
Reference in New Issue
Block a user