Making the things compiled!!

I change the #if 0 with #if WITH_FREETYPE2, also fix a lot of typos, etc.
This is the basic but now it draw text!!, I am using the "User Preference"
space to test the library, nobody is working on that and the option are
in the outliner now so...

TODO-next: using the 4x4 mat, string size, bounding box, aspect and rotate.

Notes: I update the Makefile, missing some include and other things so
maybe scons, cmake and msvc also need update ?

2 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index d4501c88e15..cf93b4f0df3 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -589,6 +589,9 @@ int WM_read_homefile(bContext *C, wmOperator *op)
 
 	strcpy(G.sce, scestr); /* restore */
 
+	BLF_lang_init();
+	BLF_init();
+
 	init_userdef_themes();
 	
 	/* When loading factory settings, the reset solid OpenGL lights need to be applied. */
@@ -598,8 +601,6 @@ int WM_read_homefile(bContext *C, wmOperator *op)
 	G.save_over = 0;	// start with save preference untitled.blend
 	G.fileflags &= ~G_FILE_AUTOPLAY;	/*  disable autoplay in .B.blend... */
 //	mainwindow_set_filename_to_title("");	// empty string re-initializes title to "Blender"
-
-	BLF_lang_init();
 	
 //	refresh_interface_font();
 	
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 9f56cfa9bd1..df3ad0d6d5c 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -223,8 +223,10 @@ void WM_exit(bContext *C)
 //	free_imagepaint();
 	
 //	fsmenu_free();
-	
+
+	BLF_exit();
 	BLF_lang_exit();
+
 	RE_FreeAllRender();
 	
 //	free_txt_data();