[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57873] trunk/blender/source: re-arrange ' --help' output into more useful sections (added debug, python).

Campbell Barton ideasman42 at gmail.com
Sat Jun 29 12:09:16 CEST 2013


Revision: 57873
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57873
Author:   campbellbarton
Date:     2013-06-29 10:09:15 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
re-arrange '--help' output into more useful sections (added debug, python).
also minor style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/screen/screen_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -138,7 +138,7 @@
 			/* draw polynomial order selector */
 			row = uiLayoutRow(layout, FALSE);
 			block = uiLayoutGetBlock(row);
-			but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5*UI_UNIT_X, 0, bwidth, UI_UNIT_Y,
+			but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5f * UI_UNIT_X, 0, bwidth, UI_UNIT_Y,
 			                &data->poly_order, 1, 100, 0, 0,
 			                TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
 			uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -2982,7 +2982,8 @@
 		return 0;
 
 	if (!(vgroup_object_in_edit_mode(ob) ||
-		vgroup_object_in_wpaint_vert_select(ob))) {
+	    vgroup_object_in_wpaint_vert_select(ob)))
+	{
 		return 0;
 	}
 

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -1639,7 +1639,7 @@
 		if (sl->spacetype == SPACE_IMAGE) {
 			SpaceImage *sima = sa->spacedata.first;
 
-			if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW)) {
+			if (sima->flag & (SI_PREVSPACE | SI_FULLWINDOW)) {
 				sima->flag &= ~SI_PREVSPACE;
 				sima->flag &= ~SI_FULLWINDOW;
 				ED_screen_full_prevspace(C, sa);

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -1059,9 +1059,9 @@
 				
 
 				dx = (int)UI_GetStringWidth(te->name);
-				if (dx < 5*UI_UNIT_X) dx = 5*UI_UNIT_X;
+				if (dx < 5 * UI_UNIT_X) dx = 5 * UI_UNIT_X;
 				spx = te->xs + 1.8f * UI_UNIT_X;
-				if (spx + dx + 0.5f*UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f*UI_UNIT_X;
+				if (spx + dx + 0.5f * UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f * UI_UNIT_X;
 
 				bt = uiDefBut(block, TEX, OL_NAMEBUTTON, "", spx, (int)te->ys, dx + UI_UNIT_X, UI_UNIT_Y - 1, (void *)te->name,
 				              1.0, (float)len, 0, 0, "");

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -30,21 +30,19 @@
  *  \ingroup cmpnodes
  */
 
-
-
 #include "node_composite_util.h"
 
 
 /* ******************* Color Balance ********************************* */
 static bNodeSocketTemplate cmp_node_colorcorrection_in[] = {
-	{	SOCK_RGBA,1,N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{	SOCK_FLOAT, 1, N_("Mask"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1,0,""}
+	{	-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_colorcorrection_out[] = {
-	{	SOCK_RGBA,0,N_("Image")},
-	{	-1,0,""}
+	{	SOCK_RGBA, 0, N_("Image")},
+	{	-1, 0, ""}
 };
 
 static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode *node)

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2013-06-29 08:41:20 UTC (rev 57872)
+++ trunk/blender/source/creator/creator.c	2013-06-29 10:09:15 UTC (rev 57873)
@@ -249,12 +249,12 @@
 	BLI_argsPrintArgDoc(ba, "--frame-jump");
 	BLI_argsPrintArgDoc(ba, "--render-output");
 	BLI_argsPrintArgDoc(ba, "--engine");
+	BLI_argsPrintArgDoc(ba, "--threads");
 	
 	printf("\n");
 	printf("Format Options:\n");
 	BLI_argsPrintArgDoc(ba, "--render-format");
 	BLI_argsPrintArgDoc(ba, "--use-extension");
-	BLI_argsPrintArgDoc(ba, "--threads");
 
 	printf("\n");
 	printf("Animation Playback Options:\n");
@@ -266,26 +266,52 @@
 	BLI_argsPrintArgDoc(ba, "--window-borderless");
 	BLI_argsPrintArgDoc(ba, "--window-geometry");
 	BLI_argsPrintArgDoc(ba, "--start-console");
+	BLI_argsPrintArgDoc(ba, "--no-native-pixels");
 
+
 	printf("\n");
 	printf("Game Engine Specific Options:\n");
 	BLI_argsPrintArgDoc(ba, "-g");
 
 	printf("\n");
-	printf("Misc Options:\n");
+	printf("Python Options:\n");
+	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
+	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
+
+	printf("\n");
+
+	BLI_argsPrintArgDoc(ba, "--python");
+	BLI_argsPrintArgDoc(ba, "--python-text");
+	BLI_argsPrintArgDoc(ba, "--python-console");
+	BLI_argsPrintArgDoc(ba, "--addons");
+
+
+	printf("\n");
+	printf("Debug Options:\n");
 	BLI_argsPrintArgDoc(ba, "--debug");
-	BLI_argsPrintArgDoc(ba, "--debug-fpe");
-	BLI_argsPrintArgDoc(ba, "--disable-crash-handler");
+	BLI_argsPrintArgDoc(ba, "--debug-value");
 
+	printf("\n");
+	BLI_argsPrintArgDoc(ba, "--debug-events");
 #ifdef WITH_FFMPEG
 	BLI_argsPrintArgDoc(ba, "--debug-ffmpeg");
 #endif
-
+	BLI_argsPrintArgDoc(ba, "--debug-handlers");
 #ifdef WITH_LIBMV
 	BLI_argsPrintArgDoc(ba, "--debug-libmv");
 #endif
+	BLI_argsPrintArgDoc(ba, "--debug-jobs");
+	BLI_argsPrintArgDoc(ba, "--debug-python");
 
+	BLI_argsPrintArgDoc(ba, "--debug-wm");
+	BLI_argsPrintArgDoc(ba, "--debug-all");
+
 	printf("\n");
+	BLI_argsPrintArgDoc(ba, "--debug-fpe");
+	BLI_argsPrintArgDoc(ba, "--disable-crash-handler");
+
+	printf("\n");
+	printf("Misc Options:\n");
 	BLI_argsPrintArgDoc(ba, "--factory-startup");
 	printf("\n");
 	BLI_argsPrintArgDoc(ba, "--env-system-config");
@@ -302,18 +328,6 @@
 
 	BLI_argsPrintArgDoc(ba, "--help");
 
-	printf("\n");
-
-	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
-	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
-
-	printf("\n");
-
-	BLI_argsPrintArgDoc(ba, "--python");
-	BLI_argsPrintArgDoc(ba, "--python-text");
-	BLI_argsPrintArgDoc(ba, "--python-console");
-	BLI_argsPrintArgDoc(ba, "--addons");
-
 #ifdef WIN32
 	BLI_argsPrintArgDoc(ba, "-R");
 	BLI_argsPrintArgDoc(ba, "-r");




More information about the Bf-blender-cvs mailing list