archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Big, big commit!!

Browse Source 
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
   the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
        Always have to link/include the freetype2 library
        Remove any reference to libbmfont
        Remove any reference to libftfont
        Remove any reference to libbftgl (or libbFTGL)
This commit is contained in:
Diego Borghetti
2009-05-05 23:10:32 +00:00
parent 71c38978e1
commit 405cf80eb8
233 changed files with 331 additions and 20598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/interface/interface_style.c
View File

@@ -171,11 +171,7 @@ void uiStyleFontDraw(uiFontStyle *fs, rcti *rect, char *str)
xofs= rect->xmax - rect->xmin - BLF_width(str);
/* clip is very strict, so we give it some space */
if (BLF_type_get() == BLF_FONT_INTERNAL)
BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+8, rect->ymax+4);
else
BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4);
BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4);
BLF_enable(BLF_CLIPPING);
if(fs->shadow)
@@ -240,18 +236,13 @@ void uiStyleInit(void)
font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size);
}
if (font->blf_id == -1) {
/* when all fail, we go back to the internal font. */
font->blf_id= BLF_load_mem("helv", NULL, 0);
}
if (font->blf_id == -1)
printf("uiStyleInit error, no fonts available\n");
else {
BLF_set(font->blf_id);
/* ? just for speed to initialize?
* Yes but only if we used the freetype2 library,
* this build the glyph cache and create the texture.
* Yes, this build the glyph cache and create
* the texture.
*/
BLF_size(11, U.dpi);
BLF_size(12, U.dpi);