diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 03:33:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 03:33:39 +0300 |
| commit | d1328feeb125328615bcf832cbc82d9f9a18e023 (patch) | |
| tree | 9243fcdd057cb7cbc710393158a7c15c41459919 /source/blender/blenlib | |
| parent | c4201e57f36e7a5bcb711bd1a92d5b334cd40dff (diff) | |
| parent | 0398ee10a1b727c63b344db3d6c8d78f6bbfd633 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index b97e41402d7..e990f0b663c 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -481,7 +481,8 @@ VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf) return vfd; } -static void *vfontdata_copy_characters_value_cb(const void *src) { +static void *vfontdata_copy_characters_value_cb(const void *src) +{ return BLI_vfontchar_copy(src, 0); } |