diff options
| author | Harley Acheson <harley> | 2020-06-22 10:10:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-22 10:13:36 +0300 |
| commit | 19c7b5f45a515df84337adf90dbce790b14f503a (patch) | |
| tree | d3e7d92b1b110f0e48a4101b9ac20e5dca504939 /source/blender/editors/curve/editfont.c | |
| parent | 61fa710aa34422a0b26d0c69ec8d5322363e2099 (diff) | |
Fix error using 'char32_t' as 'wchar_t' on windows
FONT_OT_text_insert failed on Windows.
This change was missing from D6198.
Diffstat (limited to 'source/blender/editors/curve/editfont.c')
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index dc5dc71106f..000b05e7a31 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1635,7 +1635,7 @@ static int insert_text_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); char *inserted_utf8; - wchar_t *inserted_text; + char32_t *inserted_text; int a, len; if (!RNA_struct_property_is_set(op->ptr, "text")) { @@ -1645,8 +1645,8 @@ static int insert_text_exec(bContext *C, wmOperator *op) inserted_utf8 = RNA_string_get_alloc(op->ptr, "text", NULL, 0); len = BLI_strlen_utf8(inserted_utf8); - inserted_text = MEM_callocN(sizeof(wchar_t) * (len + 1), "FONT_insert_text"); - BLI_strncpy_wchar_from_utf8(inserted_text, inserted_utf8, len + 1); + inserted_text = MEM_callocN(sizeof(char32_t) * (len + 1), "FONT_insert_text"); + len = BLI_str_utf8_as_utf32(inserted_text, inserted_utf8, MAXTEXT); for (a = 0; a < len; a++) { insert_into_textbuf(obedit, inserted_text[a]); |