diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-11-22 17:06:30 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-22 17:06:30 +0300 |
commit | 9fa2a9d18a113698c2d2498a12e468a3a1bf08d4 (patch) | |
tree | e385e870c56d01872f9ca867904a016d4f365e8f /source/creator | |
parent | 3a19c341def9f3bcd2b185293c826ef71c126cb6 (diff) | |
parent | 4617bb68ba4b1c5ab459673fffd98bf7203bb4f2 (diff) |
merge with trunk/2.5 at r24463
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 5d92b8cadc0..bd79aa9f036 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -647,7 +647,7 @@ int main(int argc, char **argv) frame = MIN2(MAXFRAME, MAX2(MINAFRAME, frame)); - RE_BlenderAnim(re, scene, frame, frame, scene->frame_step); + RE_BlenderAnim(re, scene, frame, frame, scene->r.frame_step); } } else { printf("\nError: no blend loaded. cannot use '-f'.\n"); @@ -657,7 +657,7 @@ int main(int argc, char **argv) if (CTX_data_scene(C)) { Scene *scene= CTX_data_scene(C); Render *re= RE_NewRender(scene->id.name); - RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->frame_step); + RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step); } else { printf("\nError: no blend loaded. cannot use '-a'.\n"); } @@ -697,7 +697,7 @@ int main(int argc, char **argv) Scene *scene= CTX_data_scene(C); if (a < argc) { int frame = atoi(argv[a]); - (scene->frame_step) = MIN2(MAXFRAME, MAX2(1, frame)); + (scene->r.frame_step) = MIN2(MAXFRAME, MAX2(1, frame)); } } else { printf("\nError: no blend loaded. cannot use '-j'.\n"); |