griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix truetype (freetype2) font loading

Browse Source
This commit is contained in:
Alexander Ewering
2005-09-04 09:30:57 +00:00
parent 484315332c
commit 167d2ebc12
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/font.c
View File

@@ -150,14 +150,12 @@ static VFontData *vfont_get_data(VFont *vfont)
}
}
#ifdef WITH_FREETYPE2
vfont->data= BLI_vfontdata_from_freetypefont(pf);
#else
vfont->data= BLI_vfontdata_from_psfont(pf);
#endif
if (pf) {
#ifdef WITH_FREETYPE2
vfont->data= BLI_vfontdata_from_freetypefont(pf);
#else
vfont->data= BLI_vfontdata_from_psfont(pf);
#endif
if (pf != vfont->packedfile) {
freePackedFile(pf);
}
@@ -194,7 +192,11 @@ VFont *load_vfont(char *name)
waitcursor(1);
#ifdef WITH_FREETYPE2
vfd= BLI_vfontdata_from_freetypefont(pf);
#else
vfd= BLI_vfontdata_from_psfont(pf);
#endif
if (vfd) {
vfont = alloc_libblock(&G.main->vfont, ID_VF, filename);