livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for crash in debug mode when in renderGlyph() 

reviewed by davep
master
Richard Nelson 2007-04-05 21:18:32 +00:00
parent 2c29acbaf2
commit 3ac41f9172
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llrender/llfontgl.cpp
View File

@ -674,7 +674,6 @@ S32 LLFontGL::render(const LLWString &wstr,
}
glBegin(GL_QUADS);
for (i = begin_offset; i < begin_offset + length; i++)
{
llwchar wch = wstr[i];
@ -703,8 +702,6 @@ S32 LLFontGL::render(const LLWString &wstr,
break;
}
glEnd();
ext_image->bind();
const F32 ext_x = cur_render_x + (EXT_X_BEARING * sScaleX);
const F32 ext_y = cur_render_y + (EXT_Y_BEARING * sScaleY + mAscender - mLineHeight);
@ -740,15 +737,12 @@ S32 LLFontGL::render(const LLWString &wstr,
// Bind the font texture
mImageGLp->bind();
glBegin(GL_QUADS);
}
else
{
if (!hasGlyph(wch))
{
glEnd();
(const_cast<LLFontGL*>(this))->addChar(wch);
glBegin(GL_QUADS);
}
const LLFontGlyphInfo* fgi= getGlyphInfo(wch);
@ -785,9 +779,7 @@ S32 LLFontGL::render(const LLWString &wstr,
// Kern this puppy.
if (!hasGlyph(next_char))
{
glEnd();
(const_cast<LLFontGL*>(this))->addChar(next_char);
glBegin(GL_QUADS);
}
cur_x += getXKerning(wch, next_char);
}
@ -804,8 +796,6 @@ S32 LLFontGL::render(const LLWString &wstr,
}
}
glEnd();
if (right_x)
{
*right_x = cur_x / sScaleX;