Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Borghetti <bdiego@gmail.com>2009-06-19 00:45:58 +0400
committerDiego Borghetti <bdiego@gmail.com>2009-06-19 00:45:58 +0400
commit96003b5b73d2dddac2daad5d38dc81f03b3c7738 (patch)
treef1f7d8e16bf85a758e13bfebaeb198549190cd38 /source/blender/blenfont
parent2269280910755a2be77fed2767a52f2026b0e55b (diff)
Revert a small change to kerning, Matt please let me know if now it's fine (or like before).
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/intern/blf_font.c12
1 files changed, 8 insertions, 4 deletions
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;