GL_Color no longer interacts with GL_ColorPointer (so be sure to set GL_ColorPointer...

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 83852180c8b320be25b8f7a938690620728d77b5..b488ba1136d8debfeced6921c852dbf84e074d85 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -282,7 +282,7 @@ cachepic_t  *Draw_CachePic (char *path)
                pic->tex = draw_generateditherpattern();
        if (pic->tex == NULL)
        {
-               Con_Printf ("Draw_CachePic: failed to load %s\n", path);
+               Con_Printf("Draw_CachePic: failed to load %s\n", path);
                pic->tex = r_notexture;
        }
 
@@ -433,6 +433,8 @@ void R_DrawQueue(void)
        pic = NULL;
        texnum = 0;
        color = 0;
+       GL_ColorPointer(NULL);
+       GL_Color(1,1,1,1);
 
        batch = false;
        batchcount = 0;
@@ -518,6 +520,7 @@ void R_DrawQueue(void)
                        m.pointer_texcoord[0] = mesh->data_texcoord2f;
                        R_Mesh_State_Texture(&m);
                        R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+                       GL_ColorPointer(NULL);
                        currentpic = "\0";
                        break;
                case DRAWQUEUE_SETCLIP: