[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40509] trunk/blender/source: Fix for recent Campbell's commit.

[Sergey Sharybin]

Revision: 40509
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40509
Author:   nazgul
Date:     2011-09-23 19:33:04 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Fix for recent Campbell's commit.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c	2011-09-23 18:29:45 UTC (rev 40508)
+++ trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c	2011-09-23 19:33:04 UTC (rev 40509)
@@ -139,7 +139,7 @@
 	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;
 

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2011-09-23 18:29:45 UTC (rev 40508)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2011-09-23 19:33:04 UTC (rev 40509)
@@ -829,7 +829,7 @@
 }
 */
 
-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 @@
 			// 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);