Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

blender was crashing if no argument was given after '-t'

Browse Source 
mesh.faces.deltete(...) with an empty list no longer returns an error.
This commit is contained in:
Campbell Barton
2009-01-15 18:06:06 +00:00
parent 509ca83ef1
commit c0ecbfce0e
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/api2_2x/Mesh.c
View File

@@ -5390,9 +5390,9 @@ static PyObject *MFaceSeq_delete( BPy_MFaceSeq * self, PyObject *args )
/* 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" );

2
source/blender/render/intern/source/pipeline.c
View File

@@ -2710,7 +2710,7 @@ void RE_set_max_threads(int threads)
} 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);
}
}

10
source/creator/creator.c
View File

@@ -785,10 +785,14 @@ int main(int argc, char **argv)
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 */