--- deliantra/Deliantra-Client/pango-render.c 2006/07/04 23:56:34 1.3 +++ deliantra/Deliantra-Client/pango-render.c 2006/07/05 00:16:44 1.4 @@ -190,23 +190,23 @@ _pango_opengl_font_set_cache_glyph_data (font, glyph, g); } + if (renderer->curtex) + glEnd (); + tc_get (&g->tex, bm.width, bm.height); g->left = bm.left; g->top = bm.top; - if (renderer->curtex) - { - glEnd (); - renderer->curtex = 0; - } - glBindTexture (GL_TEXTURE_2D, g->tex.name); glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); glPixelStorei (GL_UNPACK_ALIGNMENT, 1); glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); glPixelStorei (GL_UNPACK_ALIGNMENT, 4); + + renderer->curtex = g->tex.name; + glBegin (GL_QUADS); } x += g->left; @@ -224,6 +224,7 @@ glBindTexture (GL_TEXTURE_2D, g->tex.name); renderer->curtex = g->tex.name; + glBegin (GL_QUADS); }