griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles baking forcing denoising of combined pass

Browse Source 
This is mistake in the PR #117483

Simple solution: make the pass configuration logic to only disable
denoising, and never allow to enable it.

Pull Request: https://projects.blender.org/blender/blender/pulls/117723
This commit is contained in:
Sergey Sharybin
2024-02-01 14:40:50 +01:00
committed by Sergey Sharybin
parent f4867c0d70
commit 71253e1bb0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
intern/cycles/blender/session.cpp
View File

@@ -650,8 +650,12 @@ static bool bake_setup_pass(Scene *scene, const string &bake_type, const int bak
integrator->set_use_direct_light(use_direct_light);
integrator->set_use_indirect_light(use_indirect_light);
/* Disable denoiser if the pass does not support it.
* For the passes which support denoising follow the user configuration. */
const PassInfo pass_info = Pass::get_info(type);
integrator->set_use_denoise(pass_info.support_denoise);
if (integrator->get_use_denoise() && !pass_info.support_denoise) {
integrator->set_use_denoise(false);
}
return true;
}
@@ -678,6 +682,11 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
sync->sync_data(
b_render, b_depsgraph, b_v3d, b_camera_override, width, height, &python_thread_state);
/* Save the current state of the denoiser, as it might be disabled by the pass configuration (for
* passed which do not support denoising). */
Integrator *integrator = scene->integrator;
const bool was_denoiser_enabled = integrator->get_use_denoise();
/* Add render pass that we want to bake, and name it Combined so that it is
* used as that on the Blender side. */
if (!bake_setup_pass(scene, bake_type, bake_filter)) {
@@ -740,6 +749,10 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
if (bake_object) {
bake_object->set_is_shadow_catcher(was_shadow_catcher);
}
/* Restore the state of denoiser to before it was possibly disabled by the pass, so that the
* next baking pass can use the original value. */
integrator->set_use_denoise(was_denoiser_enabled);
}
void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_)