Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2021-08-04 19:31:01 +0300
committerHarley Acheson <harley.acheson@gmail.com>2021-08-04 19:31:01 +0300
commitae920d789ed3986e7c50049c074739fed7d33f32 (patch)
treea7f136509a912a34a74fccafd56f1da320a80cc5 /source/blender/blenfont
parentb5bfb5f34c1228df0ba673faf9d2a38a866115ac (diff)
VSE: Allow Wingdings and Symbol Fonts
This patch makes us less restrictive on the allowed types of FreeType font character maps we allow, rather than primarily unicode-only. This allows us to use some legacy, symbol, specialty, and proprietary fonts like Wingdings. Note we were a little less restrictive with vfonts, used for 3D Text Objects, so this patch primarily helps VSE. See D12124 for details and examples. Differential Revision: https://developer.blender.org/D12124 Reviewed by Brecht Van Lommel
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/intern/blf_font.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 53c4135254a..6e2be4a8353 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -1359,9 +1359,15 @@ FontBLF *blf_font_new(const char *name, const char *filename)
return NULL;
}
- err = FT_Select_Charmap(font->face, ft_encoding_unicode);
+ err = FT_Select_Charmap(font->face, FT_ENCODING_UNICODE);
if (err) {
- printf("Can't set the unicode character map!\n");
+ err = FT_Select_Charmap(font->face, FT_ENCODING_APPLE_ROMAN);
+ }
+ if (err && font->face->num_charmaps > 0) {
+ err = FT_Select_Charmap(font->face, font->face->charmaps[0]->encoding);
+ }
+ if (err) {
+ printf("Can't set a character map!\n");
FT_Done_Face(font->face);
MEM_freeN(font);
return NULL;