[Bf-blender-cvs] [c593b77] master: Cleanup: style, and --help edits

Campbell Barton noreply at git.blender.org
Wed Mar 2 07:11:56 CET 2016


Commit: c593b77910cb13cd68fa60ea4a0e7a190f1064aa
Author: Campbell Barton
Date:   Wed Mar 2 17:01:38 2016 +1100
Branches: master
https://developer.blender.org/rBc593b77910cb13cd68fa60ea4a0e7a190f1064aa

Cleanup: style, and --help edits

===================================================================

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/modifiers/intern/MOD_normal_edit.c
M	source/creator/creator_args.c

===================================================================

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 49b380f..519b7b4 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1500,7 +1500,7 @@ static void cdDM_buffer_copy_uv_texpaint(
 		}
 	}
 
-	MEM_freeN((void*)uv_base);
+	MEM_freeN((void *)uv_base);
 }
 
 /* treat varray_ as an array of MCol, four MCol's per face */
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c
index 409ea22..8127610 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@ -153,7 +153,7 @@ static void mix_normals(
  * (and invert matching poly normals). */
 static bool polygons_check_flip(
         MLoop *mloop, float (*nos)[3], CustomData *ldata,
-		MPoly *mpoly, float (*polynors)[3], const int num_polys)
+        MPoly *mpoly, float (*polynors)[3], const int num_polys)
 {
 	MPoly *mp;
 	int i;
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index c70f275..0df5e93 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -432,7 +432,7 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
 	printf("\t# blender --background test.blend --render-frame 1 --render-output '/tmp'\n");
 	printf("\t...will not render to '/tmp' because '--render-frame 1' renders before the output path is set\n");
 	printf("\t# blender --background --render-output /tmp test.blend --render-frame 1\n");
-	printf("\t...will not render to '/tmp' because loading the blend file overwrites the render output that was set\n");
+	printf("\t...will not render to '/tmp' because loading the blend-file overwrites the render output that was set\n");
 	printf("\t# blender --background test.blend --render-output /tmp --render-frame 1\n");
 	printf("\t...works as expected.\n\n");
 
@@ -849,7 +849,7 @@ static int arg_handle_audio_set(int argc, const char **argv, void *UNUSED(data))
 static const char arg_handle_output_set_doc[] =
 "<path>\n"
 "\tSet the render path and file name.\n"
-"\tUse '//' at the start of the path to render relative to the blend file.\n"
+"\tUse '//' at the start of the path to render relative to the blend-file.\n"
 "\n"
 "\tThe '#' characters are replaced by the frame number, and used to define zero padding.\n"
 "\t* 'ani_##_test.png' becomes 'ani_01_test.png'\n"
@@ -1540,7 +1540,7 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	//BLI_argsAdd(ba, pass, short_arg, long_arg, doc, cb, C);
 
 	/* end argument processing after -- */
-	BLI_argsAdd(ba, -1, "--", NULL, arg_handle_arguments_end_doc, arg_handle_arguments_end, NULL);
+	BLI_argsAdd(ba, -1, "--", NULL, CB(arg_handle_arguments_end), NULL);
 
 	/* first pass: background mode, disable python and commands that exit after usage */
 	BLI_argsAdd(ba, 1, "-h", "--help", CB(arg_handle_print_help), ba);




More information about the Bf-blender-cvs mailing list