[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20996] branches/blender2.5/blender/source /blender/blenfont/intern/blf_font.c: Revert a small change to kerning, Matt please let me know if now it's fine (or like before).

[Diego Borghetti]

Revision: 20996
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20996
Author:   bdiego
Date:     2009-06-18 22:45:58 +0200 (Thu, 18 Jun 2009)

Log Message:
-----------
Revert a small change to kerning, Matt please let me know if now it's fine (or like before).

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c

Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c	2009-06-18 20:23:46 UTC (rev 20995)
+++ branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c	2009-06-18 20:45:58 UTC (rev 20996)
@@ -146,18 +146,20 @@
 
 			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 @@
 
 			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;