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

Font update. Minor refactor, and removed some pointless code that was leaking.

Browse Source
This commit is contained in:
Shyotl
2013-11-18 09:56:49 -06:00
parent 2badc1c79c
commit be249ac8a1
9 changed files with 298 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/llrender/llfontregistry.cpp
View File

@@ -421,7 +421,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
llwarns << "createFont failed, no file names specified" << llendl;
return NULL;
}
LLFontList *fontlistp = new LLFontList;
LLFontFreetype::font_vector_t fontlist;
LLFontGL *result = NULL;
// Snarf all fonts we can into fontlistp. First will get pulled
@@ -466,19 +467,24 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
is_first_found = false;
}
else
fontlistp->addAtEnd(fontp);
{
fontlist.push_back(fontp->mFontFreetype);
delete fontp;
fontp = NULL;
}
}
}
if (result && !fontlistp->empty())
if (result && !fontlist.empty())
{
result->setFallbackFont(fontlistp);
result->mFontFreetype->setFallbackFonts(fontlist);
}
norm_desc.setStyle(match_desc->getStyle());
if (result)
result->setFontDesc(norm_desc);
if (!result)
{
result->mFontDescriptor = desc;
}
else
{
llwarns << "createFont failed in some way" << llendl;
}