[Bf-blender-cvs] [b2656a6ee4d] master: Fix T62887: When searching for fonts, thumbnail display mode will crash Blender
Sebastian Parborg
noreply at git.blender.org
Tue Mar 26 14:14:02 CET 2019
Commit: b2656a6ee4d554fdd6dcf9cc0d9427d1a8307a10
Author: Sebastian Parborg
Date: Tue Mar 26 14:08:42 2019 +0100
Branches: master
https://developer.blender.org/rBb2656a6ee4d554fdd6dcf9cc0d9427d1a8307a10
Fix T62887: When searching for fonts, thumbnail display mode will crash Blender
We do not support special color fonts (like colored emoji fonts), so
don't crash when trying to create a preview for unsupported fonts.
Reviewed By: Brecht
Differential Revision: http://developer.blender.org/D4590
===================================================================
M source/blender/blenfont/intern/blf_glyph.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 27e67f700bc..20cd6a51a47 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -89,11 +89,11 @@ KerningCacheBLF *blf_kerning_cache_new(FontBLF *font)
FT_UInt glyph_index = FT_Get_Char_Index(font->face, i);
g = blf_glyph_add(font, glyph_index, i);
}
- /* Cannot fail since it has been added just before. */
+ /* Can fail on certain fonts */
GlyphBLF *g_prev = blf_glyph_search(font->glyph_cache, j);
FT_Vector delta = { .x = 0, .y = 0, };
- if (FT_Get_Kerning(font->face, g_prev->idx, g->idx, kc->mode, &delta) == 0) {
+ if (g_prev && FT_Get_Kerning(font->face, g_prev->idx, g->idx, kc->mode, &delta) == 0) {
kc->table[i][j] = (int)delta.x >> 6;
}
else {
More information about the Bf-blender-cvs
mailing list