To end the issues with AA (International) Fonts; the .bfont.tff now is

compiled in (datatoc) and doesn't need installation anymore.

Also reviewed weird path conventions for searching AA fonts;

- U.fontdir is only used as standard search path for fileselecting
- U.fontname stores only full path to AA font if used one
- If a font cannot be found, it always falls back to the compiled in one
- If .B.blend is saved with default font, U.fontname is not set

Also added a button in usermenu "restore default".

When this works as expected, I'll commit changes for installation too.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/ftfont/intern/FTF_Api.cpp b/source/blender/ftfont/intern/FTF_Api.cpp
index 40d904b253f..46638d9f4eb 100644
--- a/source/blender/ftfont/intern/FTF_Api.cpp
+++ b/source/blender/ftfont/intern/FTF_Api.cpp
@@ -132,14 +132,14 @@ FTF_EXPORT void FTF_GetBoundingBox(char* str, float *llx, float *lly, float *llz
 
 /**
   * added by phase
-  *
+  * changed by ton; to allow both file load as memory load (datasize!=0)
   */
-FTF_EXPORT int FTF_SetFont(char* str, int size)
+FTF_EXPORT int FTF_SetFont(const unsigned char* str, int datasize, int fontsize)
 {
-  return _FTF_GetFont()->SetFont(str, size);
+  return _FTF_GetFont()->SetFont(str, datasize, fontsize);
 }
 
-/* added bt ton */
+/* added by ton */
 
 FTF_EXPORT void FTF_SetFontSize(char size)
 {