diff options
| author | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
|---|---|---|
| committer | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
| commit | e734491048ef2436af41e272b8900f20785ecbe6 (patch) | |
| tree | 8cee3fc068c782c0ba8cb9a581e768968c565569 /intern/cycles/app/cycles_standalone.cpp | |
| parent | f21cd0881948f6eaf16af0b354cd904df7407bda (diff) | |
| parent | 204b01a254ac2445fea217e5211b2ed6aef631ca (diff) | |
Merge branch 'master' into soc-2021-knife-toolssoc-2021-knife-tools
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 6b3513b065a..270096d70b0 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -126,7 +126,7 @@ static BufferParams &session_buffer_params() static void scene_init() { - options.scene = new Scene(options.scene_params, options.session->device); + options.scene = options.session->scene; /* Read XML */ xml_read_file(options.scene, options.filepath.c_str()); @@ -148,7 +148,7 @@ static void scene_init() static void session_init() { options.session_params.write_render_cb = write_render; - options.session = new Session(options.session_params); + options.session = new Session(options.session_params, options.scene_params); if (options.session_params.background && !options.quiet) options.session->progress.set_update_callback(function_bind(&session_print_status)); @@ -159,7 +159,6 @@ static void session_init() /* load scene */ scene_init(); - options.session->scene = options.scene; options.session->reset(session_buffer_params(), options.session_params.samples); options.session->start(); @@ -527,9 +526,6 @@ static void options_parse(int argc, const char **argv) fprintf(stderr, "No file path specified\n"); exit(EXIT_FAILURE); } - - /* For smoother Viewport */ - options.session_params.start_resolution = 64; } CCL_NAMESPACE_END |