Bugfix #26135
authorTon Roosendaal <ton@blender.org>
Fri, 18 Feb 2011 16:13:13 +0000 (16:13 +0000)
committerTon Roosendaal <ton@blender.org>
Fri, 18 Feb 2011 16:13:13 +0000 (16:13 +0000)
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
source/blender/blenfont/intern/blf_glyph.c

index da78c2427b6286b06de4faaf25d729cec52c607d..ce68df5c8b6e09446150c325ae4eba7fa4099a00 100644 (file)
@@ -53,7 +53,7 @@
 
 
 /* freetype2 handle. */
-static FT_Library global_ft_lib;
+FT_Library global_ft_lib;
 
 int blf_font_init(void)
 {
index 3639f598c10cf60c55e2e7e5ce567ceb6ef3b51d..9a3843b960d9fea5dc68ed4455a77ff93d010a6f 100644 (file)
@@ -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)
 {