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>2010-03-14 15:49:55 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-14 15:49:55 +0300
commit004925c0f163249b6de184346fe131c5a92e9e07 (patch)
tree966c1cf4ed18bb22dd69b44c29e9825bc1c3b8c1 /source/creator
parent827938d08508da412691ae918e47cd39e8195e3d (diff)
Fix #21572: command line render start frame can't be < 1. I've set it
to use MINFRAME now which is 0, negative frames are not supported for this yet.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 61079057c8f..9e910b7cad2 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -718,7 +718,7 @@ static int set_start_frame(int argc, char **argv, void *data)
Scene *scene= CTX_data_scene(C);
if (argc > 1) {
int frame = atoi(argv[1]);
- (scene->r.sfra) = MIN2(MAXFRAME, MAX2(1, frame));
+ (scene->r.sfra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
return 1;
} else {
printf("\nError: frame number must follow '-s'.\n");
@@ -737,7 +737,7 @@ static int set_end_frame(int argc, char **argv, void *data)
Scene *scene= CTX_data_scene(C);
if (argc > 1) {
int frame = atoi(argv[1]);
- (scene->r.efra) = MIN2(MAXFRAME, MAX2(1, frame));
+ (scene->r.efra) = CLAMPIS(frame, MINFRAME, MAXFRAME);
return 1;
} else {
printf("\nError: frame number must follow '-e'.\n");
@@ -756,10 +756,10 @@ static int set_skip_frame(int argc, char **argv, void *data)
Scene *scene= CTX_data_scene(C);
if (argc > 1) {
int frame = atoi(argv[1]);
- (scene->r.frame_step) = MIN2(MAXFRAME, MAX2(1, frame));
+ (scene->r.frame_step) = CLAMPIS(frame, 1, MAXFRAME);
return 1;
} else {
- printf("\nError: number of frames must follow '-j'.\n");
+ printf("\nError: number of frames to step must follow '-j'.\n");
return 0;
}
} else {