diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:02:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-26 19:02:28 +0300 |
| commit | 9e48cafd6d6a3512a41e98e71d957923fbf3cb1d (patch) | |
| tree | 1431c8a1fd6e834059d4aa1f063620a036feba46 /source/blender/blenfont | |
| parent | 290e080db40e746416d2f70d28cb906ceb4c4723 (diff) | |
| parent | fd69ba225540cde5e4c1fa651fb02df21ea0a143 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_thumbs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c index 133168fccf2..b6f5ffbb092 100644 --- a/source/blender/blenfont/intern/blf_thumbs.c +++ b/source/blender/blenfont/intern/blf_thumbs.c @@ -98,6 +98,10 @@ void BLF_thumb_preview( blf_font_size(font, (unsigned int)MAX2(font_size_min, font_size_curr), dpi); + /* font->glyph_cache remains NULL if blf_font_size() failed to set font size */ + if (!font->glyph_cache) + break; + /* decrease font size each time */ font_size_curr -= (font_size_curr / font_shrink); font_shrink += 1; |