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:
authorCampbell Barton <ideasman42@gmail.com>2012-02-19 21:59:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-19 21:59:30 +0400
commit51488283564273c5e796d5ca3ded47f2726330e8 (patch)
treea6149b89048c7827e7f762e469050dd8d94e7d50 /source/creator
parent85d99737b5753fd845c3fce0f08e6b5205530195 (diff)
parent5cd85ed57ea649c58c7c19d709bfc4cae7fffcad (diff)
svn merge ^/trunk/blender -r44235:44250
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 68a7bc415a8..0b67dfabf16 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -727,7 +727,7 @@ static int render_frame(int argc, const char **argv, void *data)
BKE_reports_init(&reports, RPT_PRINT);
- frame = MIN2(MAXFRAME, MAX2(MINAFRAME, frame));
+ frame = CLAMPIS(frame, MINAFRAME, MAXFRAME);
RE_SetReports(re, &reports);
RE_BlenderAnim(re, bmain, scene, NULL, scene->lay, frame, frame, scene->r.frame_step);