[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54545] trunk/blender: misc changes

[Campbell Barton]

Revision: 54545
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54545
Author:   campbellbarton
Date:     2013-02-14 05:02:20 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/doc/manpage/blender.1
    trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c
    trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c	2013-02-14 04:27:27 UTC (rev 54544)
+++ trunk/blender/source/blender/blenlib/intern/string_cursor_utf8.c	2013-02-14 05:02:20 UTC (rev 54545)
@@ -145,9 +145,11 @@
 
 	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 @@
 	}
 	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;

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-02-14 04:27:27 UTC (rev 54544)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-02-14 05:02:20 UTC (rev 54545)
@@ -3131,8 +3131,8 @@
 
 		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);

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2013-02-14 04:27:27 UTC (rev 54544)
+++ trunk/blender/source/creator/creator.c	2013-02-14 05:02:20 UTC (rev 54545)
@@ -1366,7 +1366,7 @@
 	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);