diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
| commit | 87627374000b7de7445736a7239a3f2b168ce7eb (patch) | |
| tree | 2f0fe5d42d0938fc1b684af702d8613099bea1bd /source/creator | |
| parent | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (diff) | |
| parent | ba8ea9ec63c25b1ce134a846176f7bf252f4d487 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 5a70b033f84..0160ac7acb2 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -750,6 +750,9 @@ int main(int argc, char **argv) else if (!strcmp(argv[a],"FRAMESERVER")) scene->r.imtype = R_FRAMESERVER; else if (!strcmp(argv[a],"CINEON")) scene->r.imtype = R_CINEON; else if (!strcmp(argv[a],"DPX")) scene->r.imtype = R_DPX; +#if WITH_OPENJPEG + else if (!strcmp(argv[a],"JP2")) G.scene->r.imtype = R_JP2; +#endif else printf("\nError: Format from '-F' not known or not compiled in this release.\n"); } } else { @@ -759,10 +762,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 */ |