diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-14 09:02:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-14 09:02:20 +0400 |
commit | 648f925017788560b7d05fab3f5f2e4e3c39c8e6 (patch) | |
tree | 18cbf22b7f2f6d04c62424497014792136aec297 /source | |
parent | ab7ca2dc441239686bcc44189c79e377ba4d089c (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')
-rw-r--r-- | source/blender/blenlib/intern/string_cursor_utf8.c | 8 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 4 | ||||
-rw-r--r-- | source/creator/creator.c | 2 |
3 files changed, 9 insertions, 5 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; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 8911e227373..dd4f5221003 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -3131,8 +3131,8 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart) if (flip_faces) { SWAP(float, a2, a3); - SWAP(PEdge*, e2, e3); - SWAP(PVert*, v2, v3); + SWAP(PEdge *, e2, e3); + SWAP(PVert *, v2, v3); } sina1 = sin(a1); diff --git a/source/creator/creator.c b/source/creator/creator.c index 7ab5d9ff2bd..4b74e225ec4 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1366,7 +1366,7 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) BLI_argsAdd(ba, 2, "-p", "--window-geometry", "<sx> <sy> <w> <h>\n\tOpen with lower left corner at <sx>, <sy> and width and height as <w>, <h>", prefsize, NULL); BLI_argsAdd(ba, 2, "-w", "--window-border", "\n\tForce opening with borders (default)", with_borders, NULL); BLI_argsAdd(ba, 2, "-W", "--window-borderless", "\n\tForce opening without borders", without_borders, NULL); - BLI_argsAdd(ba, 2, "-con", "--start-console", "\n\tStart with the console window open (ignored if -b is set)", start_with_console, NULL); + BLI_argsAdd(ba, 2, "-con", "--start-console", "\n\tStart with the console window open (ignored if -b is set), (Windows only)", start_with_console, NULL); BLI_argsAdd(ba, 2, "-R", NULL, "\n\tRegister .blend extension, then exit (Windows only)", register_extension, NULL); BLI_argsAdd(ba, 2, "-r", NULL, "\n\tSilently register .blend extension, then exit (Windows only)", register_extension, ba); BLI_argsAdd(ba, 2, NULL, "--no-native-pixels", "\n\tDo not use native pixel size, for high resolution displays (MacBook 'Retina')", native_pixels, ba); |