[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45575] trunk/blender/source/blender/ editors/space_view3d/drawmesh.c: Fix related to #30917: wrong colors in cycles textured draw mode in some cases,

[Brecht Van Lommel]

Revision: 45575
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45575
Author:   blendix
Date:     2012-04-12 15:23:34 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Fix related to #30917: wrong colors in cycles textured draw mode in some cases,
missed call to glColorMaterial made glEnable(GL_COLOR_MATERIAL) behavior
undefined.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawmesh.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2012-04-12 14:36:57 UTC (rev 45574)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2012-04-12 15:23:34 UTC (rev 45575)
@@ -883,6 +883,7 @@
 			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0);
 
 			/* bind texture */
+			glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 			glEnable(GL_COLOR_MATERIAL);
 			glEnable(GL_TEXTURE_2D);