diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 09:43:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 09:43:59 +0400 |
| commit | 7c5163829275577884c83184537c2fdd9aba92bc (patch) | |
| tree | ff5854feeb461043352833c757c2c5de2f218563 /source/blender/blenkernel/intern/font.c | |
| parent | c62cb4416d43990f8c87556f024c87e6615ecd2e (diff) | |
Fix T40180: Space between letters adds space after last letter
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
| -rw-r--r-- | source/blender/blenkernel/intern/font.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ef861e2844c..5ae4180267d 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)) ) |