Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-12-29 16:34:13 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-29 16:34:13 +0400
commit1c8d1569dac3e9bc5afd8aa5f5d12a93354c8cad (patch)
treeaa0e720cd364ef8f08bd1a3c4bae5d3aa19996be /source/blender/editors/curve/editfont.c
parent451343022a14cc978029fb416a8dbfcd4bc716ab (diff)
correction to previous commit
Diffstat (limited to 'source/blender/editors/curve/editfont.c')
-rw-r--r--source/blender/editors/curve/editfont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 653768f0386..1ca97da5f74 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -238,7 +238,7 @@ static void update_string(Curve *cu)
/* Copy the wchar to UTF-8 */
BLI_strncpy_wchar_as_utf8(cu->str, ef->textbuf, len + 1);
- BLI_assert(len == cu->len);
+ BLI_assert(wcslen(ef->textbuf) == cu->len);
}
static int insert_into_textbuf(Object *obedit, uintptr_t c)
@@ -571,7 +571,7 @@ static int kill_selection(Object *obedit, int ins) /* 1 == new character */
size = (cu->len * sizeof(wchar_t)) - (selstart * sizeof(wchar_t)) + (offset * sizeof(wchar_t));
memmove(ef->textbuf + selstart, ef->textbuf + getfrom, size);
memmove(ef->textbufinfo + selstart, ef->textbufinfo + getfrom, ((cu->len - selstart) + offset) * sizeof(CharInfo));
- cu->len -= ((selend - selstart) + 1) + offset;
+ cu->len -= ((selend - selstart) + 1);
cu->selstart = cu->selend = 0;
}