diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-07 15:57:16 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-07 15:57:16 +0300 |
| commit | 3cfbdc2bb43796545c27239a2a3a339e355e96a9 (patch) | |
| tree | 3264cca91cba0135cce42a766d798bd16c7470f9 /intern/cycles | |
| parent | c83b171794fcdd57a9d880750da22b62d2cd1e3d (diff) | |
| parent | 1a1fb5a47cd03a85b350825ecd46b0ea7a160319 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/render/object.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 3636c28ee99..c428516deec 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -558,7 +558,8 @@ array<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay, PointerRNA crp = RNA_pointer_get(&b_srlay.ptr, "cycles"); if(get_boolean(crp, "denoising_store_passes") && - get_boolean(crp, "use_denoising")) { + get_boolean(crp, "use_denoising")) + { b_engine.add_pass("Denoising Normal", 3, "XYZ", b_srlay.name().c_str()); b_engine.add_pass("Denoising Normal Variance", 3, "XYZ", b_srlay.name().c_str()); b_engine.add_pass("Denoising Albedo", 3, "RGB", b_srlay.name().c_str()); diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index a12a0d297f0..c70111d15b0 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -264,7 +264,7 @@ bool Object::is_traceable() uint Object::visibility_for_tracing() const { uint trace_visibility = visibility; - if (is_shadow_catcher) { + if(is_shadow_catcher) { trace_visibility &= ~PATH_RAY_SHADOW_NON_CATCHER; } else { |