[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33345] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Particle draw was calling glColorMaterial(...) after glEnable( GL_COLOR_MATERIAL), this is documented to be incorrect.

[Campbell Barton]

Revision: 33345
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33345
Author:   campbellbarton
Date:     2010-11-27 00:38:23 +0100 (Sat, 27 Nov 2010)

Log Message:
-----------
Particle draw was calling glColorMaterial(...) after glEnable(GL_COLOR_MATERIAL), this is documented to be incorrect.
On my system it set the ambient color value to 1.0.

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-11-26 22:12:46 UTC (rev 33344)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-11-26 23:38:23 UTC (rev 33345)
@@ -4105,8 +4105,8 @@
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnableClientState(GL_COLOR_ARRAY);
 
+	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 	glEnable(GL_COLOR_MATERIAL);
-	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 	glShadeModel(GL_SMOOTH);
 
 	if(pset->brushtype == PE_BRUSH_WEIGHT) {