[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13745] trunk/blender/source/blender/src/ drawobject.c:

[Brecht Van Lommel]

Revision: 13745
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13745
Author:   blendix
Date:     2008-02-18 12:29:08 +0100 (Mon, 18 Feb 2008)

Log Message:
-----------

Bugfix for particle path drawing messing up opengl state in some cases.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawobject.c

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2008-02-18 11:16:20 UTC (rev 13744)
+++ trunk/blender/source/blender/src/drawobject.c	2008-02-18 11:29:08 UTC (rev 13745)
@@ -3426,12 +3426,12 @@
 				glEnableClientState(GL_VERTEX_ARRAY);
 				glEnableClientState(GL_NORMAL_ARRAY);
 				glEnable(GL_LIGHTING);
+
+				glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 				glEnable(GL_COLOR_MATERIAL);
 
-				if(part->draw&PART_DRAW_MAT_COL) {
+				if(part->draw&PART_DRAW_MAT_COL)
 					glEnableClientState(GL_COLOR_ARRAY);
-					glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-				}
 
 				if(totchild && (part->draw&PART_DRAW_PARENT)==0)
 					totpart=0;