1 files changed, 20 insertions, 27 deletions

diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 98da85e3a8c..a8b50b66f5f 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -40,6 +40,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
+#include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
 #include "BLI_vfontdata.h"
 
@@ -286,7 +287,6 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile *pf)
   const FT_ULong charcode_reserve = 256;
   FT_ULong charcode = 0, lcode;
   FT_UInt glyph_index;
-  const char *fontname;
   VFontData *vfd;
 
   /* load the freetype font */
@@ -299,36 +299,29 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile *pf)
   /* allocate blender font */
   vfd = MEM_callocN(sizeof(*vfd), "FTVFontData");
 
-  /* get the name */
-  fontname = FT_Get_Postscript_Name(face);
-  BLI_strncpy(vfd->name, (fontname == NULL) ? "" : fontname, sizeof(vfd->name));
+  /* Get the name. */
+  if (face->family_name) {
+    BLI_snprintf(vfd->name, sizeof(vfd->name), "%s %s", face->family_name, face->style_name);
+    BLI_utf8_invalid_strip(vfd->name, strlen(vfd->name));
+  }
+
+  /* Select a character map. */
+  err = FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+  if (err) {
+    err = FT_Select_Charmap(face, FT_ENCODING_APPLE_ROMAN);
+  }
+  if (err && face->num_charmaps > 0) {
+    err = FT_Select_Charmap(face, face->charmaps[0]->encoding);
+  }
+  if (err) {
+    FT_Done_Face(face);
+    MEM_freeN(vfd);
+    return NULL;
+  }
 
   /* Extract the first 256 character from TTF */
   lcode = charcode = FT_Get_First_Char(face, &glyph_index);
 
-  /* No `charmap` found from the TTF so we need to figure it out. */
-  if (glyph_index == 0) {
-    FT_CharMap found = NULL;
-    FT_CharMap charmap;
-    int n;
-
-    for (n = 0; n < face->num_charmaps; n++) {
-      charmap = face->charmaps[n];
-      if (charmap->encoding == FT_ENCODING_APPLE_ROMAN) {
-        found = charmap;
-        break;
-      }
-    }
-
-    err = FT_Set_Charmap(face, found);
-
-    if (err) {
-      return NULL;
-    }
-
-    lcode = charcode = FT_Get_First_Char(face, &glyph_index);
-  }
-
   /* Blender default BFont is not "complete". */
   const bool complete_font = (face->ascender != 0) && (face->descender != 0) &&
                              (face->ascender != face->descender);