Skip to content
Snippets Groups Projects
Commit a94a9232 authored by Alissa Sabre's avatar Alissa Sabre
Browse files

storm-1723: fix character display when a lot of different characters are used

parent dbc91a7f
No related branches found
No related tags found
No related merge requests found
...@@ -159,6 +159,7 @@ Alissa Sabre ...@@ -159,6 +159,7 @@ Alissa Sabre
VWR-12620 VWR-12620
VWR-12789 VWR-12789
SNOW-322 SNOW-322
STORM-1723
Alliez Mysterio Alliez Mysterio
Angus Boyd Angus Boyd
VWR-592 VWR-592
......
...@@ -304,6 +304,18 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons ...@@ -304,6 +304,18 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
S32 next_bitmap_num = fgi->mBitmapNum; S32 next_bitmap_num = fgi->mBitmapNum;
if (next_bitmap_num != bitmap_num) if (next_bitmap_num != bitmap_num)
{ {
// Actually draw the queued glyphs before switching their texture;
// otherwise the queued glyphs will be taken from wrong textures.
if (glyph_count > 0)
{
gGL.begin(LLRender::QUADS);
{
gGL.vertexBatchPreTransformed(vertices, uvs, colors, glyph_count * 4);
}
gGL.end();
glyph_count = 0;
}
bitmap_num = next_bitmap_num; bitmap_num = next_bitmap_num;
LLImageGL *font_image = font_bitmap_cache->getImageGL(bitmap_num); LLImageGL *font_image = font_bitmap_cache->getImageGL(bitmap_num);
gGL.getTexUnit(0)->bind(font_image); gGL.getTexUnit(0)->bind(font_image);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment