diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
| commit | eed13b43b19c619ccdcda67b17c0da65ad44879c (patch) | |
| tree | aa759322ad2b18becaf237671dd71ffbda9c2076 /source/blender/blenlib | |
| parent | e10e1ac04e63ed04a5712e515ed28eb92a78fd62 (diff) | |
| parent | 2f1e118c30946bd3117c59cd45f13d79e4b612ec (diff) | |
merged from trunk 20741:20848
* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 0f2a6179964..bde4b561f26 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -294,9 +294,12 @@ int objchr_to_ftvfontdata(VFont *vfont, FT_ULong charcode) tf->pf->size, 0, &face); + if (err) return FALSE; + } + else { + err = TRUE; + return FALSE; } - else - err= TRUE; // Read the char freetypechar_to_vchar(face, charcode, vfont->data); |