[Bf-blender-cvs] [1c8d156] master: correction to previous commit

Campbell Barton noreply at git.blender.org
Sun Dec 29 13:35:03 CET 2013


Commit: 1c8d1569dac3e9bc5afd8aa5f5d12a93354c8cad
Author: Campbell Barton
Date:   Sun Dec 29 23:34:13 2013 +1100
https://developer.blender.org/rB1c8d1569dac3e9bc5afd8aa5f5d12a93354c8cad

correction to previous commit

===================================================================

M	source/blender/editors/curve/editfont.c

===================================================================

diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 653768f..1ca97da 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;
 	}




More information about the Bf-blender-cvs mailing list