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.

4 files changed, 30 insertions, 8 deletions

diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1
index 2addb60c5f7..9cefe7a2b24 100644
--- a/doc/manpage/blender.1
+++ b/doc/manpage/blender.1
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "December 04, 2012" "Blender Blender 2\&.65"
+.TH "BLENDER" "1" "February 14, 2013" "Blender Blender 2\&.66"
 
 .SH NAME
 blender \- a 3D modelling and rendering package
@@ -15,7 +15,7 @@ Use Blender to create TV commercials, to make technical visualizations, business
 http://www.blender.org
 .SH OPTIONS
 
-Blender 2.65
+Blender 2.66
 Usage: blender [args ...] [file] [args ...]
 .br
 .SS "Render Options:"
@@ -218,6 +218,12 @@ Turn debugging on
 Enable floating point exceptions
 .br
 
+.TP
+.B \-\-disable\-crash\-handler
+.br
+Disable the crash handler
+.br
+
 .IP
 
 .TP
@@ -301,7 +307,13 @@ Disable automatic python script execution (pydrivers & startup scripts)
 .TP
 .B \-P or \-\-python <filename>
 .br
-Run the given Python script (filename or Blender Text)
+Run the given Python script file
+.br
+
+.TP
+.B \-\-python\-text <name>
+.br
+Run the given Python script text block
 .br
 
 .TP
@@ -398,6 +410,12 @@ Register .blend extension, then exit (Windows only)
 Silently register .blend extension, then exit (Windows only)
 .br
 
+.TP
+.B \-\-no\-native\-pixels
+.br
+Do not use native pixel size, for high resolution displays (MacBook 'Retina')
+.br
+
 .SS "Argument Parsing:"
 
     arguments must be separated by white space. eg
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);