Commit: af069cd013e14642cecb46026f929cd5c897fd05
Author: Antony Riakiotakis
Date: Thu Sep 25 23:11:51 2014 +0200
Branches: master
https://developer.blender.org/rBaf069cd013e14642cecb46026f929cd5c897fd05
OpenGL fix: GL_COLOR_ARRAY is client state
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 8c74679..2f0f6d5 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5182,7 +5182,7 @@ static void draw_new_particle_system(Scene *scene, View3D
*v3d, RegionView3D *rv
/* restore & clean up */
if (1) { //ob_dt > OB_WIRE) {
if (part->draw_col == PART_DRAW_COL_MAT)
- glDisable(GL_COLOR_ARRAY);
+ glDisableClientState(GL_COLOR_ARRAY);
glDisable(GL_COLOR_MATERIAL);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
