diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
commit | 9893fee4e6ce5949c8d3274b2746855b3095258f (patch) | |
tree | 973d8b46af8d83705ecc97c21f12bbb1799af2a3 /intern/cycles/blender | |
parent | 535984a848865c07a39610b32a53432d1a078c59 (diff) | |
parent | 140f2209b61d637411cfbc22c755703c6220278f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index cbead20488a..d031d12b507 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -501,7 +501,7 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_) if(!b_engine.is_preview() && background && print_render_stats) { RenderStats stats; - session->scene->collect_statistics(&stats); + session->collect_statistics(&stats); printf("Render statistics:\n%s\n", stats.full_report().c_str()); } diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 8a9b881b7d4..b023183217e 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -830,7 +830,8 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, } /* tiles */ - if(params.device.type != DEVICE_CPU && !background) { + const bool is_cpu = (params.device.type == DEVICE_CPU); + if(!is_cpu && !background) { /* currently GPU could be much slower than CPU when using tiles, * still need to be investigated, but meanwhile make it possible * to work in viewport smoothly @@ -907,6 +908,9 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, params.progressive_update_timeout = 0.1; } + params.use_profiling = params.device.has_profiling && !b_engine.is_preview() && + background && BlenderSession::print_render_stats; + return params; } |