[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18527] trunk/blender/source: blender was crashing if no argument was given after '-t'

[Campbell Barton]

Revision: 18527
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18527
Author:   campbellbarton
Date:     2009-01-15 19:06:06 +0100 (Thu, 15 Jan 2009)

Log Message:
-----------
blender was crashing if no argument was given after '-t'
mesh.faces.deltete(...) with an empty list no longer returns an error.

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Mesh.c
    trunk/blender/source/blender/render/intern/source/pipeline.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/python/api2_2x/Mesh.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Mesh.c	2009-01-15 16:57:17 UTC (rev 18526)
+++ trunk/blender/source/blender/python/api2_2x/Mesh.c	2009-01-15 18:06:06 UTC (rev 18527)
@@ -5390,9 +5390,9 @@
 
 	/* see how many args we need to parse */
 	len = PySequence_Size( args );
-	if( len < 1 )
-		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"sequence must contain at least one int or MFace" );
+	if( len < 1 ) {
+		Py_RETURN_NONE;
+	}
 
 	face_table = MEM_callocN( len*sizeof( unsigned int ),
 			"face_table" );

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2009-01-15 16:57:17 UTC (rev 18526)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2009-01-15 18:06:06 UTC (rev 18527)
@@ -2710,7 +2710,7 @@
 	} else if(threads>=1 && threads<=BLENDER_MAX_THREADS) {
 		commandline_threads= threads;
 	} else {
-		printf("Error, threads has to be in range 1-%d\n", BLENDER_MAX_THREADS);
+		printf("Error, threads has to be in range 0-%d\n", BLENDER_MAX_THREADS);
 	}
 }
 

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2009-01-15 16:57:17 UTC (rev 18526)
+++ trunk/blender/source/creator/creator.c	2009-01-15 18:06:06 UTC (rev 18527)
@@ -785,10 +785,14 @@
 				
 			case 't':
 				a++;
-				if(G.background) {
-					RE_set_max_threads(atoi(argv[a]));
+				if (a < argc) {
+					if(G.background) {
+						RE_set_max_threads(atoi(argv[a]));
+					} else {
+						printf("Warning: threads can only be set in background mode\n");
+					}
 				} else {
-					printf("Warning: threads can only be set in background mode\n");
+					printf("\nError: you must specify a number of threads between 0 and 8 '-t '.\n");
 				}
 				break;
 			case 'x': /* extension */