From: Diego Borghetti Date: Thu, 18 Jun 2009 20:45:58 +0000 (+0000) Subject: Revert a small change to kerning, Matt please let me know if now it's fine (or like... X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/commitdiff_plain/96003b5b73d2dddac2daad5d38dc81f03b3c7738 Revert a small change to kerning, Matt please let me know if now it's fine (or like before). --- diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 921f5cac67c..ee4ba0ee71a 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -146,18 +146,20 @@ void blf_font_draw(FontBLF *font, char *str) if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) { pen_x += delta.x >> 6; - +/* if (pen_x < old_pen_x) pen_x= old_pen_x; +*/ } } if (font->flags & BLF_USER_KERNING) { old_pen_x= pen_x; pen_x += font->kerning; - +/* if (pen_x < old_pen_x) pen_x= old_pen_x; +*/ } /* do not return this loop if clipped, we want every character tested */ @@ -226,18 +228,20 @@ void blf_font_boundbox(FontBLF *font, char *str, rctf *box) if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) { pen_x += delta.x >> 6; - +/* if (pen_x < old_pen_x) old_pen_x= pen_x; +*/ } } if (font->flags & BLF_USER_KERNING) { old_pen_x= pen_x; pen_x += font->kerning; - +/* if (pen_x < old_pen_x) old_pen_x= pen_x; +*/ } gbox.xmin= g->box.xmin + pen_x;