From ac35ee4bd51e51c18b1629f8d3ec47ba394de33d Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 18 Feb 2011 16:13:13 +0000 Subject: 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! --- source/blender/blenfont/intern/blf_font.c | 2 +- source/blender/blenfont/intern/blf_glyph.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/blenfont') 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) { -- cgit v1.2.3