diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 10:00:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 10:04:08 +0400 |
commit | c7ab68f1c4d02136bd70d4a17eaae4b78254db74 (patch) | |
tree | e1325ea03f6c24d47130188d0ebefb0e12fd4e46 /source/blender/blenkernel | |
parent | 2eeab8f1912e2214044b9aacb11acbb54d07de7b (diff) |
Fixes for font underline
- underline faces had flipped winding by default.
- BKE_vfont_to_curve_ex disallowed 0 underline height (annoying when sliding value)
- disallow negative underline height since it flips underline direction (just change position + height)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 5ae4180267d..637ae03e924 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -312,10 +312,10 @@ static void build_underline(Curve *cu, ListBase *nubase, const rctf *rect, bp = (BPoint *)MEM_callocN(4 * sizeof(BPoint), "underline_bp"); - copy_v4_fl4(bp[0].vec, rect->xmin, (rect->ymin + yofs), 0.0f, 1.0f); - copy_v4_fl4(bp[1].vec, rect->xmax, (rect->ymin + yofs), 0.0f, 1.0f); - copy_v4_fl4(bp[2].vec, rect->xmax, (rect->ymax + yofs), 0.0f, 1.0f); - copy_v4_fl4(bp[3].vec, rect->xmin, (rect->ymax + yofs), 0.0f, 1.0f); + copy_v4_fl4(bp[0].vec, rect->xmin, (rect->ymax + yofs), 0.0f, 1.0f); + copy_v4_fl4(bp[1].vec, rect->xmax, (rect->ymax + yofs), 0.0f, 1.0f); + copy_v4_fl4(bp[2].vec, rect->xmax, (rect->ymin + yofs), 0.0f, 1.0f); + copy_v4_fl4(bp[3].vec, rect->xmin, (rect->ymin + yofs), 0.0f, 1.0f); nu2->bp = bp; BLI_addtail(nubase, nu2); @@ -556,9 +556,6 @@ bool BKE_vfont_to_curve_ex(Main *bmain, Object *ob, int mode, ListBase *r_nubase /* The VFont Data can not be found */ if (!vfd) return ok; - - if (cu->ulheight == 0.0f) - cu->ulheight = 0.05f; if (ef) { slen = ef->len; |