Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the text is too skinny to render, don't crash

Browse Source
This commit is contained in:
Siana Gearz
2013-11-20 10:33:15 +01:00
parent 060628397b
commit 9c29488044
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llrender/llfontgl.cpp
View File

@@ -150,7 +150,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
return wstr.length() ;
}
if (wstr.empty())
if (wstr.empty() || !max_pixels)
{
return 0;
}
@@ -440,11 +440,14 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
}
}
gGL.begin(LLRender::QUADS);
if(glyph_count)
{
gGL.vertexBatchPreTransformed(vertices, uvs, colors, glyph_count * 4);
gGL.begin(LLRender::QUADS);
{
gGL.vertexBatchPreTransformed(vertices, uvs, colors, glyph_count * 4);
}
gGL.end();
}
gGL.end();
if (right_x)