[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34974] trunk/blender/source/blender/ blenfont/intern: Bugfix #26135

Ton Roosendaal ton at blender.org
Fri Feb 18 17:13:14 CET 2011


Revision: 34974
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34974
Author:   ton
Date:     2011-02-18 16:13:13 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
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!

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_font.c
    trunk/blender/source/blender/blenfont/intern/blf_glyph.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c	2011-02-18 15:21:52 UTC (rev 34973)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c	2011-02-18 16:13:13 UTC (rev 34974)
@@ -53,7 +53,7 @@
 
 
 /* freetype2 handle. */
-static FT_Library global_ft_lib;
+FT_Library global_ft_lib;
 
 int blf_font_init(void)
 {

Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2011-02-18 15:21:52 UTC (rev 34973)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2011-02-18 16:13:13 UTC (rev 34974)
@@ -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)
 {




More information about the Bf-blender-cvs mailing list