Bugfix #2704

Modified bFTGL so the bitmaps supplied by the font itself aren't used.
Patch originally supplied by Shizu, somehow this was never added to
FTGL.

Be sure to build binaries with bFTGL, not the provided ftgl.lib from the
lib dir. (this one can be deleted afaic)

2 files changed, 2 insertions, 2 deletions

diff --git a/extern/bFTGL/src/FTGLPixmapFont.cpp b/extern/bFTGL/src/FTGLPixmapFont.cpp
index 1b35e2ab11d..2654b85e31e 100755
--- a/extern/bFTGL/src/FTGLPixmapFont.cpp
+++ b/extern/bFTGL/src/FTGLPixmapFont.cpp
@@ -18,7 +18,7 @@ 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/extern/bFTGL/src/FTGLTextureFont.cpp b/extern/bFTGL/src/FTGLTextureFont.cpp
index 6be32a2fb3b..1712ed54779 100755
--- a/extern/bFTGL/src/FTGLTextureFont.cpp
+++ b/extern/bFTGL/src/FTGLTextureFont.cpp
@@ -56,7 +56,7 @@ 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)
     {