diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-08-07 00:06:02 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-08-07 00:06:02 +0400 |
| commit | 74b3681532b028e66f29aef19d2a0a7e18da6ee2 (patch) | |
| tree | 03f2b984694b9d64ce84db504d53b525f71e0a09 /source/blender/blenfont/intern/blf_font.c | |
| parent | e84e6664c225c0aed7e4d4c2ea812a48bc57ca3a (diff) | |
Remove bitmap mode from blenfont, only draw with textures.
As Joe point on a previous mail, glBitmap don't work nice
on all cards and also some of the things that we can do
with texture are hard (or need that blender check the font mode)
to implement.
Diffstat (limited to 'source/blender/blenfont/intern/blf_font.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 6fc35a96e1e..c804fb6399d 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -128,17 +128,6 @@ void blf_font_draw(FontBLF *font, char *str) if (!g) continue; - /* - * This happen if we change the mode of the - * font, we don't drop the glyph cache, so it's - * possible that some glyph don't have the - * bitmap or texture information. - */ - if (font->mode == BLF_MODE_BITMAP && (!g->bitmap_data)) - g= blf_glyph_add(font, glyph_index, c); - else if (font->mode == BLF_MODE_TEXTURE && (!g->tex_data)) - g= blf_glyph_add(font, glyph_index, c); - if (has_kerning && g_prev) { delta.x= 0; delta.y= 0; @@ -200,17 +189,6 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box) if (!g) continue; - /* - * This happen if we change the mode of the - * font, we don't drop the glyph cache, so it's - * possible that some glyph don't have the - * bitmap or texture information. - */ - if (font->mode == BLF_MODE_BITMAP && (!g->bitmap_data)) - g= blf_glyph_add(font, glyph_index, c); - else if (font->mode == BLF_MODE_TEXTURE && (!g->tex_data)) - g= blf_glyph_add(font, glyph_index, c); - if (has_kerning && g_prev) { delta.x= 0; delta.y= 0; @@ -316,7 +294,6 @@ void blf_font_free(FontBLF *font) void blf_font_fill(FontBLF *font) { - font->mode= BLF_MODE_TEXTURE; font->aspect= 1.0f; font->pos[0]= 0.0f; font->pos[1]= 0.0f; |