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-02-14 09:02:20 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-02-14 09:02:20 +0400
commit648f925017788560b7d05fab3f5f2e4e3c39c8e6 (patch)
tree18cbf22b7f2f6d04c62424497014792136aec297 /source/blender/blenlib/intern/string_cursor_utf8.c
parentab7ca2dc441239686bcc44189c79e377ba4d089c (diff)
misc changes
- update man page for new additions since last release. - note that --start-console argument is windows only. - correct own assertion in own recent commit.
Diffstat (limited to 'source/blender/blenlib/intern/string_cursor_utf8.c')
-rw-r--r--source/blender/blenlib/intern/string_cursor_utf8.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c
index b8797855f17..674d5ae5c8d 100644
--- a/source/blender/blenlib/intern/string_cursor_utf8.c
+++ b/source/blender/blenlib/intern/string_cursor_utf8.c
@@ -145,9 +145,11 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen,
if (direction == STRCUR_DIR_NEXT) {
if (use_init_step) {
- BLI_assert(jump == STRCUR_JUMP_DELIM);
BLI_str_cursor_step_next_utf8(str, maxlen, pos);
}
+ else {
+ BLI_assert(jump == STRCUR_JUMP_DELIM);
+ }
if (jump != STRCUR_JUMP_NONE) {
const strCursorDelimType delim_type = (*pos) < maxlen ? cursor_delim_type(&str[*pos]) : STRCUR_DELIM_NONE;
@@ -167,9 +169,11 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen,
}
else if (direction == STRCUR_DIR_PREV) {
if (use_init_step) {
- BLI_assert(jump == STRCUR_JUMP_DELIM);
BLI_str_cursor_step_prev_utf8(str, maxlen, pos);
}
+ else {
+ BLI_assert(jump == STRCUR_JUMP_DELIM);
+ }
if (jump != STRCUR_JUMP_NONE) {
const strCursorDelimType delim_type = (*pos) > 1 ? cursor_delim_type(&str[(*pos) - 1]) : STRCUR_DELIM_NONE;