[Bf-blender-cvs] [365e19b] hair_immediate_fixes: Fix for OpenlGL state restoration after strand drawing, disable color material option.

[Lukas Tönne]

Commit: 365e19b7be9c65ff654756dc7661d4c511b678fe
Author: Lukas Tönne
Date:   Thu Dec 4 14:01:19 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB365e19b7be9c65ff654756dc7661d4c511b678fe

Fix for OpenlGL state restoration after strand drawing, disable color
material option.

===================================================================

M	source/blender/editors/space_view3d/drawstrands.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawstrands.c b/source/blender/editors/space_view3d/drawstrands.c
index 3aee274..282621e 100644
--- a/source/blender/editors/space_view3d/drawstrands.c
+++ b/source/blender/editors/space_view3d/drawstrands.c
@@ -111,6 +111,7 @@ static void restore_opengl_state(const StrandsDrawInfo *info)
 	
 	glDisable(GL_BLEND);
 	glDisable(GL_LIGHTING);
+	glDisable(GL_COLOR_MATERIAL);
 	glShadeModel(GL_FLAT);
 	if (info->has_zbuf)
 		glEnable(GL_DEPTH_TEST);