svn merge ^/trunk/blender -r40395:40405

2011-09-23 10:58:20 +00:00
parent 460cde345b 9d1b4b63b3
commit 161c3861bc
23 changed files with 393 additions and 204 deletions
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -403,7 +403,10 @@ void WM_exit_ext(bContext *C, const short do_python)
 	free_posebuf();

 	BLF_exit();
+
+#ifdef INTERNATIONAL
 	BLF_free_unifont();
+#endif
 	
 	ANIM_keyingset_infos_exit();