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/makesrna/intern/rna_curve.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/makesrna/intern/rna_curve.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 6a3ab632fd4..d7deccef355 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -585,7 +585,7 @@ static void rna_Curve_body_set(PointerRNA *ptr, const char *value) MEM_freeN(cu->strinfo); } - cu->str = MEM_mallocN(len_bytes + sizeof(wchar_t), "str"); + cu->str = MEM_mallocN(len_bytes + sizeof(char32_t), "str"); cu->strinfo = MEM_callocN((len_chars + 4) * sizeof(CharInfo), "strinfo"); BLI_strncpy(cu->str, value, len_bytes + 1); |