diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:51:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:51:07 +0300 |
| commit | 1b2f8b27540f6154dc968f216297ab9badccd271 (patch) | |
| tree | aa85314a8fd56db3e235df644f8e4e35386138cb /intern/cycles/app | |
| parent | 705d214349ef480e94461eb9ac0499a9f2beafc1 (diff) | |
| parent | 5c2752380883d8f2e6655bd5397871f049ee8bbb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 0b9a4042e0e..2d4b0d35e54 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -121,7 +121,6 @@ static void scene_init() static void session_init() { options.session = new Session(options.session_params); - options.session->reset(session_buffer_params(), options.session_params.samples); if(options.session_params.background && !options.quiet) options.session->progress.set_update_callback(function_bind(&session_print_status)); @@ -134,6 +133,7 @@ static void session_init() scene_init(); options.session->scene = options.scene; + options.session->reset(session_buffer_params(), options.session_params.samples); options.session->start(); } |