From 7b8e07b7d011fe7245499a267ac967d5787a59e9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Jan 2014 14:41:33 +1100 Subject: Fix for own error in recent text3d changes Called important function from within an assert. --- source/blender/editors/curve/editfont.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/curve') diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index ef3d7dae14c..9ba7eb3cd20 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1545,6 +1545,7 @@ void make_editText(Object *obedit) { Curve *cu = obedit->data; EditFont *ef = cu->editfont; + int len_wchar; if (ef == NULL) { ef = cu->editfont = MEM_callocN(sizeof(EditFont), "editfont"); @@ -1556,8 +1557,9 @@ void make_editText(Object *obedit) } /* Convert the original text to wchar_t */ - BLI_assert(BLI_strncpy_wchar_from_utf8(ef->textbuf, cu->str, MAXTEXT + 4) == cu->len_wchar); /* length is bogus */ - ef->len = cu->len_wchar; + len_wchar = BLI_strncpy_wchar_from_utf8(ef->textbuf, cu->str, MAXTEXT + 4); + BLI_assert(len_wchar == cu->len_wchar); + ef->len = len_wchar; memcpy(ef->textbufinfo, cu->strinfo, ef->len * sizeof(CharInfo)); -- cgit v1.2.3