Fixed the wireframe mode hanging when returning back to normal rendering

This commit is contained in:
cholleme 2003-03-02 20:23:52 +00:00
parent 411e8b3362
commit df3444bf14

View file

@ -1523,6 +1523,15 @@ void DrawTextureChains (void)
} }
} }
if (gl_wireframe.value) {
for (i=0 ; i<cl.worldmodel->nummapshaders ; i++)
{
cl.worldmodel->mapshaders[i].meshchain = NULL;
cl.worldmodel->mapshaders[i].texturechain = NULL;
}
}
//R_DisableVertexTable(VERTEX_TEXTURE | VERTEX_LIGHTMAP); //R_DisableVertexTable(VERTEX_TEXTURE | VERTEX_LIGHTMAP);
GL_SelectTexture(GL_TEXTURE1_ARB); GL_SelectTexture(GL_TEXTURE1_ARB);
GL_DisableMultitexture(); GL_DisableMultitexture();
@ -2707,7 +2716,8 @@ void GL_BuildLightmaps (void)
for (i=0 ; i<cl.worldmodel->numlightmaps ; i++) for (i=0 ; i<cl.worldmodel->numlightmaps ; i++)
{ {
Con_Printf("Lightmap %i\n",i);
//Con_Printf("Lightmap %i\n",i);
GL_Bind(lightmap_textures + i); GL_Bind(lightmap_textures + i);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);