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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-09-15 10:30:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-09-15 10:35:20 +0300
commit028c5592cd80469c695fba9cd5276bba354df2cd (patch)
treec9a4698132e8a0738f6bb565bc8240edacb1370b /source/creator
parent4bd014e951a1b2c30e035a24eda3fbb32f3fdd62 (diff)
parent8b3ad25862e47fca9e4ec923f4e9157b278173ed (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator_args.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index f25efbf72e9..76d9190f251 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1326,7 +1326,7 @@ static int arg_handle_render_frame(int argc, const char **argv, void *data)
return 1;
}
- re = RE_NewRender(scene->id.name);
+ re = RE_NewSceneRender(scene);
BLI_begin_threaded_malloc();
BKE_reports_init(&reports, RPT_STORE);
@@ -1368,7 +1368,7 @@ static int arg_handle_render_animation(int UNUSED(argc), const char **UNUSED(arg
Scene *scene = CTX_data_scene(C);
if (scene) {
Main *bmain = CTX_data_main(C);
- Render *re = RE_NewRender(scene->id.name);
+ Render *re = RE_NewSceneRender(scene);
ReportList reports;
BLI_begin_threaded_malloc();
BKE_reports_init(&reports, RPT_STORE);