diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-18 19:13:13 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-18 19:13:13 +0300 |
| commit | ac35ee4bd51e51c18b1629f8d3ec47ba394de33d (patch) | |
| tree | ed24ef19ec2eab3369b77ff86f5c11eed9a9a5d3 /source/blender/blenfont | |
| parent | 13f9715e1cfa36787577f11b933c26d7da365e47 (diff) | |
Bugfix #26135
User Preferences
Using "no AA font" crashed, caused by commit to make static variables.
However, how this was ever meant to work... using such globals has to be
treated carefully. Fixed for now with XXX warning for Diego :)
Thanks to reporter Susanne H. to point at the right code!
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 2 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index da78c2427b6..ce68df5c8b6 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -53,7 +53,7 @@ /* freetype2 handle. */ -static FT_Library global_ft_lib; +FT_Library global_ft_lib; int blf_font_init(void) { diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 3639f598c10..9a3843b960d 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -51,7 +51,8 @@ #include "blf_internal_types.h" #include "blf_internal.h" -static FT_Library global_ft_lib; +/* XXX copied from blf_font.c */ +extern FT_Library global_ft_lib; GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi) { |