Commit f644541413a918ecd898d6853fcc2b565afb346f

sammy 2008-04-25T10:00:44

* Disable the use of the font's internal bitmap in FTGLTextureFont and FTGLPixmapFont. Patch by Shizu, from Blender commit r4569.

diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index a50fb15..ad66080 100644
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -56,7 +56,8 @@ FTGLPixmapFont::~FTGLPixmapFont()
 
 FTGlyph* FTGLPixmapFont::MakeGlyph( unsigned int g)
 {
-    FT_GlyphSlot ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING);
+    FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_NO_HINTING
+                                          | FT_LOAD_NO_BITMAP);
 
     if( ftGlyph)
     {
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 9b6e78f..39b9a4e 100644
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -95,8 +95,9 @@ FTGLTextureFont::~FTGLTextureFont()
 
 FTGlyph* FTGLTextureFont::MakeGlyph( unsigned int glyphIndex)
 {
-    FT_GlyphSlot ftGlyph = face.Glyph( glyphIndex, FT_LOAD_NO_HINTING);
-    
+    FT_GlyphSlot ftGlyph = face.Glyph(glyphIndex, FT_LOAD_NO_HINTING
+                                                   | FT_LOAD_NO_BITMAP);
+
     if( ftGlyph)
     {
         glyphHeight = static_cast<int>( charSize.Height());