griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r40498:40511

Browse Source
This commit is contained in:
Campbell Barton
2011-09-24 11:03:52 +00:00
parent 2cc2e9b841 a043133bab
commit dab7dba2db
10 changed files with 799 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, int has_vcol, 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, int has_vcol, int matnr)
// don't use mcol
return 2;
}
if (!has_vcol) {
if (!has_mcol) {
// we have to set the color from the material
unsigned char rgba[4];
current_polymat->GetMaterialRGBAColor(rgba);