diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-30 16:13:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-30 16:13:47 +0300 |
commit | dffde4a49cd73d0d6003258d6ac36526652cd5d5 (patch) | |
tree | ca75c960a89099a359849bfa3f594e6e553fb649 /intern/cycles/render | |
parent | 500fbfd02a1cae02ecf34d6fe49748b3c1b8ac05 (diff) | |
parent | 7c0d37deca32512ff38120bf1736160110fe97cb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/session.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/session.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 8bc175a094d..d6ecafa19b7 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -682,7 +682,7 @@ DeviceRequestedFeatures Session::get_requested_device_features() BakeManager *bake_manager = scene->bake_manager; requested_features.use_baking = bake_manager->get_baking(); requested_features.use_integrator_branched = (scene->integrator->method == Integrator::BRANCHED_PATH); - if(params.use_denoising) { + if(params.denoising_passes) { requested_features.use_denoising = true; requested_features.use_shadow_tricks = true; } diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 61f62f8e712..d2ec13ada1f 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -58,6 +58,7 @@ public: bool display_buffer_linear; bool use_denoising; + bool denoising_passes; int denoising_radius; float denoising_strength; float denoising_feature_strength; @@ -89,6 +90,7 @@ public: threads = 0; use_denoising = false; + denoising_passes = false; denoising_radius = 8; denoising_strength = 0.0f; denoising_feature_strength = 0.0f; |