diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-22 06:59:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-22 06:59:12 +0300 |
| commit | 71466cac1efae5e942596ec25c8787478f8356b0 (patch) | |
| tree | 6915cecf1e70e9f8139c31097ae42b1c73130221 /intern | |
| parent | 7756973b0c35c5759db240158717d0f5bf0f45dc (diff) | |
| parent | 64a6c78a9a2a789b5be6ba5e3162a10f90a2ac5c (diff) | |
Merge branch 'master' into blender2.8
Reverts: 92fd931e536
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/session.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index d0aa985b035..8bc175a094d 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -682,7 +682,10 @@ 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); - requested_features.use_denoising = params.use_denoising; + if(params.use_denoising) { + requested_features.use_denoising = true; + requested_features.use_shadow_tricks = true; + } return requested_features; } |