diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-12 22:04:05 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-12 22:04:05 +0300 |
commit | 1b55b911f24e57013167a29f4e01c091020421bc (patch) | |
tree | 0659b0983c2ac13a3b14c76ae6b5f9f277828809 /intern/cycles/blender | |
parent | d845ba481c6d2ef50bf87bec834555d5e1faf64c (diff) | |
parent | 71131b4969813e037986b4fa91439e8b86059057 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/session.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/intern/cycles/blender/session.cpp b/intern/cycles/blender/session.cpp index d9a2d3d3029..b7fd862bffd 100644 --- a/intern/cycles/blender/session.cpp +++ b/intern/cycles/blender/session.cpp @@ -606,6 +606,19 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_, pass->set_type(bake_type_to_pass(bake_type, bake_filter)); pass->set_include_albedo((bake_filter & BL::BakeSettings::pass_filter_COLOR)); + if (pass->get_type() == PASS_COMBINED) { + /* Filtering settings for combined pass. */ + Integrator *integrator = scene->integrator; + integrator->set_use_direct_light((bake_filter & BL::BakeSettings::pass_filter_DIRECT) != 0); + integrator->set_use_indirect_light((bake_filter & BL::BakeSettings::pass_filter_INDIRECT) != + 0); + integrator->set_use_diffuse((bake_filter & BL::BakeSettings::pass_filter_DIFFUSE) != 0); + integrator->set_use_glossy((bake_filter & BL::BakeSettings::pass_filter_GLOSSY) != 0); + integrator->set_use_transmission((bake_filter & BL::BakeSettings::pass_filter_TRANSMISSION) != + 0); + integrator->set_use_emission((bake_filter & BL::BakeSettings::pass_filter_EMIT) != 0); + } + session->set_display_driver(nullptr); session->set_output_driver(make_unique<BlenderOutputDriver>(b_engine)); |