4 files changed, 5 insertions, 21 deletions
diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile
index fa9550041c5..dfc8187de49 100644
--- a/source/blender/editors/interface/Makefile
+++ b/source/blender/editors/interface/Makefile
@@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 
-CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
 CPPFLAGS += -I../../windowmanager
@@ -48,7 +47,6 @@ CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../makesdna
 CPPFLAGS += -I../../makesrna
 CPPFLAGS += -I../../imbuf
-CPPFLAGS += -I../../ftfont
 CPPFLAGS += -I../../blenfont
 
 # own include 
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
index fa89cd4891c..bac3742c12f 100644
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -7,14 +7,12 @@ for source in env.Glob('*_api.c'):
 	sources.remove(source)
 
 incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #intern/bmfont'
+incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc'
 incs += ' #/extern/glew/include'
 
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
-    incs += ' ../../ftfont'
     defs.append('INTERNATIONAL')
-    defs.append('FTGL_STATIC_LIBRARY')
 
 env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[110] )
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index 8c07a6ea0ab..d0361174e70 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -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);
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 3b503f00fd3..6107aa4ccc8 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -49,8 +49,6 @@
 
 #include "ED_screen.h"
 
-#include "BMF_Api.h"
-
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -1391,8 +1389,7 @@ static void scroll_printstr(View2DScrollers *scrollers, Scene *scene, float x, f
 	}
 	
 	/* draw it */
-	glRasterPos2f(x, y);
-	BMF_DrawString(G.fonts, str); // XXX check this again when new text-drawing api is done
+	BLF_draw_default(x, y, 0.0f, str);
 }
 
 /* local defines for scrollers drawing */