Revert a small change to kerning, Matt please let me know if now it's fine (or like...
authorDiego Borghetti <bdiego@gmail.com>
Thu, 18 Jun 2009 20:45:58 +0000 (20:45 +0000)
committerDiego Borghetti <bdiego@gmail.com>
Thu, 18 Jun 2009 20:45:58 +0000 (20:45 +0000)
source/blender/blenfont/intern/blf_font.c

index 921f5cac67c3b724a733c1f68127adba0796820c..ee4ba0ee71a6d3b9ce63488bec8d840cf67239fb 100644 (file)
@@ -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;