[Bf-blender-cvs] [7c51638] master: Fix T40180: Space between letters adds space after last letter

[Campbell Barton]

Commit: 7c5163829275577884c83184537c2fdd9aba92bc
Author: Campbell Barton
Date:   Thu May 15 15:43:59 2014 +1000
https://developer.blender.org/rB7c5163829275577884c83184537c2fdd9aba92bc

Fix T40180: Space between letters adds space after last letter

===================================================================

M	source/blender/blenkernel/intern/font.c

===================================================================

diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index ef861e2..5ae4180 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -717,12 +717,13 @@ makebreak:
 
 			yof -= linedist;
 
-			maxlen = max_ff(maxlen, (xof - tb->x / cu->fsize));
-			linedata[lnr] = xof - tb->x / cu->fsize;
+			linedata[lnr] = (xof - xtrax) - (tb->x / cu->fsize);
 			linedata2[lnr] = cnr;
 			linedata3[lnr] = tb->w / cu->fsize;
 			linedata4[lnr] = wsnr;
-			
+
+			CLAMP_MIN(maxlen, linedata[lnr]);
+
 			if ((tb->h != 0.0f) &&
 			    ((-(yof - (tb->y / cu->fsize))) > ((tb->h / cu->fsize) - (linedist * cu->fsize)) - cu->yof) &&
 			    (cu->totbox > (curbox + 1)) )