avoid bugs introduced by the attempt to skip image processing - a closer

look is needed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11096 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2c92bb5623c37c0fcbc64e6d3a6e6a3febc9ce5b

diff --git a/ft2.c b/ft2.c
index 0b34f5294c0bbc56622785f2f680341ad4f53484..c706fb19c627a646934475bd6e3ba435efe84d86 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -1226,7 +1226,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
        map->sfy = mapstart->sfy;
 
        pitch = map->glyphSize * FONT_CHARS_PER_LINE * bytesPerPixel;
-       if (map->pic->tex == r_texture_notexture)
+//     if (map->pic->tex == r_texture_notexture)
        {
                data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch);
                if (!data)
@@ -1493,7 +1493,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
                map->glyphs[mapch].image = false;
        }
 
-       if (data)
+       if (map->pic->tex == r_texture_notexture)
        {
                int w = map->glyphSize * FONT_CHARS_PER_LINE;
                int h = map->glyphSize * FONT_CHAR_LINES;