Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-16 03:03:35 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-16 03:03:35 +0400
commit0792ab3652ce31377f9a994430cd62cd849d6684 (patch)
treec9092444a37d147738918eb6f7abd1ec5b2783c5 /source/creator
parent63ff37c6d4b081f06c4319326057df3104213504 (diff)
Fix #29232: on background render where it could not find the .blend file, the
default cube would be rendered instead, now stops processing arguments after failed file load.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 1f6f4d85f43..38f9527e64b 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -437,7 +437,7 @@ static int prefsize(int argc, const char **argv, void *UNUSED(data))
int stax, stay, sizx, sizy;
if (argc < 5) {
- printf ("-p requires four arguments\n");
+ fprintf (stderr, "-p requires four arguments\n");
exit(1);
}
@@ -515,7 +515,7 @@ static int no_audio(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(da
static int set_audio(int argc, const char **argv, void *UNUSED(data))
{
if (argc < 1) {
- printf("-setaudio require one argument\n");
+ fprintf(stderr, "-setaudio require one argument\n");
exit(1);
}
@@ -977,6 +977,10 @@ static int load_file(int UNUSED(argc), const char **argv, void *data)
DAG_on_visible_update(CTX_data_main(C), TRUE);
}
+ else {
+ /* failed to load file, stop processing arguments */
+ return -1;
+ }
/* WM_read_file() runs normally but since we're in background mode do here */
#ifdef WITH_PYTHON