diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-05-31 18:35:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-05-31 18:35:16 +0300 |
| commit | 610619c2031056330f174bcee590c363cb6b45fc (patch) | |
| tree | c727cba5259db3f9cf1b754267961d955a96e25e /intern/cycles/scene | |
| parent | a40b6111283186b188864cd427ac2ec2970acfef (diff) | |
| parent | f2cd7e08fed02fdf02060c17c943e15e85638cb5 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'intern/cycles/scene')
| -rw-r--r-- | intern/cycles/scene/scene.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp index b35242139ea..8b5604eba72 100644 --- a/intern/cycles/scene/scene.cpp +++ b/intern/cycles/scene/scene.cpp @@ -550,7 +550,7 @@ void Scene::update_kernel_features() dscene.data.integrator.use_caustics = false; if (has_caustics_caster && has_caustics_receiver && has_caustics_light) { dscene.data.integrator.use_caustics = true; - kernel_features |= KERNEL_FEATURE_NODE_RAYTRACE; + kernel_features |= KERNEL_FEATURE_MNEE; } if (bake_manager->get_baking()) { @@ -597,6 +597,7 @@ static void log_kernel_features(const uint features) << "\n"; VLOG(2) << "Use Shader Raytrace " << string_from_bool(features & KERNEL_FEATURE_NODE_RAYTRACE) << "\n"; + VLOG(2) << "Use MNEE" << string_from_bool(features & KERNEL_FEATURE_MNEE) << "\n"; VLOG(2) << "Use Transparent " << string_from_bool(features & KERNEL_FEATURE_TRANSPARENT) << "\n"; VLOG(2) << "Use Denoising " << string_from_bool(features & KERNEL_FEATURE_DENOISING) << "\n"; VLOG(2) << "Use Path Tracing " << string_from_bool(features & KERNEL_FEATURE_PATH_TRACING) |