diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-11-22 18:26:54 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-11-22 18:27:34 +0300 |
| commit | 177dfc6384b926dd19e3b7e98a995ccb4da9167c (patch) | |
| tree | 865abe9f707bee039a506bfc17cb4cff218bd6c6 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 1304cee920c5f01fd9f0474ea782db61ac031403 (diff) | |
Fix T71273: Bad encoding of utf-8 for Text objects
`BLI_strncpy_wchar_from_utf8` internally assumes `wchar_t` is 32 bits
which is not the case on windows.
The solution is to replace `wchar_t` with `char32_t`.
Thanks to @robbott for compatibility on macOS.
Differential Revision: https://developer.blender.org/D6198
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 6b6c68b197e..eceeb231285 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -491,7 +491,7 @@ static void make_duplis_font(const DupliContext *ctx) float vec[3], obmat[4][4], pmat[4][4], fsize, xof, yof; int text_len, a; size_t family_len; - const wchar_t *text = NULL; + const char32_t *text = NULL; bool text_free = false; /* font dupliverts not supported inside collections */ |