diff options
author | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
---|---|---|
committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
commit | 405cf80eb8dc2df8ae160aee70aef34052add24a (patch) | |
tree | f03cc27e95bdf91b25ea9d2a0dffb28ccef666be /source/blender/blenfont/intern/blf_font.c | |
parent | 71c38978e14ebf3522fe60fc239ad04f10ef30ab (diff) |
Big, big commit!!
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)
Diffstat (limited to 'source/blender/blenfont/intern/blf_font.c')
-rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 6d185378c25..02b21264115 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -30,15 +30,11 @@ #include <stdlib.h> #include <string.h> -#ifdef WITH_FREETYPE2 - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -58,8 +54,6 @@ #include "blf_internal.h" -#ifdef WITH_FREETYPE2 - /* freetype2 handle. */ FT_Library global_ft_lib; @@ -294,7 +288,6 @@ void blf_font_free(FontBLF *font) void blf_font_fill(FontBLF *font) { - font->type= BLF_FONT_FREETYPE2; font->mode= BLF_MODE_TEXTURE; font->ref= 1; font->aspect= 1.0f; @@ -372,16 +365,3 @@ FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size) blf_font_fill(font); return(font); } - -#else /* !WITH_FREETYPE2 */ - -int blf_font_init(void) -{ - return(0); -} - -void blf_font_exit(void) -{ -} - -#endif /* WITH_FREETYPE2 */ |