diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-22 11:55:26 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-22 11:55:26 +0300 |
commit | d2cb0f955b25857cb4f3fd28ebc4567f997d56b2 (patch) | |
tree | c2d2af62baaa3e6294d6493190b1be02d7b149e9 /intern/cycles/render/scene.cpp | |
parent | 31632e7f74423aec01d64e3964200a03a70491d8 (diff) |
Cycles: Reduce verbosity of logging
Mainly makes logging less verbose when doing progressive sampling in viewport.
Such kind of verbosity is not really possible to be filtered out with `grep`
so let's reshuffle few lines of code.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r-- | intern/cycles/render/scene.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 29163c53109..b0052c30af4 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -135,7 +135,9 @@ void Scene::device_update(Device *device_, Progress& progress) { if(!device) device = device_; - + + bool print_stats = need_data_update(); + /* The order of updates is important, because there's dependencies between * the different managers, using data computed by previous managers. * @@ -239,9 +241,11 @@ void Scene::device_update(Device *device_, Progress& progress) device->const_copy_to("__data", &dscene.data, sizeof(dscene.data)); } - VLOG(1) << "System memory statistics after full device sync:\n" - << " Usage: " << util_guarded_get_mem_used() << "\n" - << " Peak: " << util_guarded_get_mem_peak(); + if(print_stats) { + VLOG(1) << "System memory statistics after full device sync:\n" + << " Usage: " << util_guarded_get_mem_used() << "\n" + << " Peak: " << util_guarded_get_mem_peak(); + } } Scene::MotionType Scene::need_motion(bool advanced_shading) @@ -278,11 +282,10 @@ bool Scene::need_update() return (need_reset() || film->need_update); } -bool Scene::need_reset() +bool Scene::need_data_update() { return (background->need_update || image_manager->need_update - || camera->need_update || object_manager->need_update || mesh_manager->need_update || light_manager->need_update @@ -295,6 +298,11 @@ bool Scene::need_reset() || film->need_update); } +bool Scene::need_reset() +{ + return need_data_update() || camera->need_update; +} + void Scene::reset() { shader_manager->reset(this); |