diff options
| author | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
|---|---|---|
| committer | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
| commit | 6594fa1ce02809a275c9cd488fa0223d03d73571 (patch) | |
| tree | 0bcd95846e1e3b09239126b40ef434ed3dc3a50d /intern/cycles/blender/addon/engine.py | |
| parent | f2017083a19e5c83aadc575625dce0642ffce6c5 (diff) | |
merged the master branchsoc-2017-vertex_paint
Diffstat (limited to 'intern/cycles/blender/addon/engine.py')
| -rw-r--r-- | intern/cycles/blender/addon/engine.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index b5149b5082e..3018fd5b316 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -239,7 +239,8 @@ def register_passes(engine, scene, srl): if crl.pass_debug_bvh_intersections: engine.register_pass(scene, srl, "Debug BVH Intersections", 1, "X", 'VALUE') if crl.pass_debug_ray_bounces: engine.register_pass(scene, srl, "Debug Ray Bounces", 1, "X", 'VALUE') - if crl.use_denoising and crl.denoising_store_passes: + cscene = scene.cycles + if crl.use_denoising and crl.denoising_store_passes and not cscene.use_progressive_refine: engine.register_pass(scene, srl, "Denoising Normal", 3, "XYZ", 'VECTOR') engine.register_pass(scene, srl, "Denoising Normal Variance", 3, "XYZ", 'VECTOR') engine.register_pass(scene, srl, "Denoising Albedo", 3, "RGB", 'COLOR') |