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)

1 files changed, 0 insertions, 9 deletions

diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index a042eefb4d9..af49dda0023 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -32,20 +32,12 @@ unsigned int blf_next_p2(unsigned int x);
 unsigned int blf_hash(unsigned int val);
 int blf_utf8_next(unsigned char *buf, int *iindex);
 
-void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2);
-void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2);
-void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2);
-
 char *blf_dir_search(const char *file);
 int blf_dir_split(const char *str, char *file, int *size);
 
 int blf_font_init(void);
 void blf_font_exit(void);
 
-FontBLF *blf_internal_new(char *name);
-
-#ifdef WITH_FREETYPE2
-
 FontBLF *blf_font_new(char *name, char *filename);
 FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size);
 
@@ -59,5 +51,4 @@ GlyphBLF *blf_glyph_add(FontBLF *font, FT_UInt index, unsigned int c);
 void blf_glyph_free(GlyphBLF *g);
 int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y);
 
-#endif /* WITH_FREETYPE2 */
 #endif /* BLF_INTERNAL_H */