diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-02-12 13:55:42 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-02-12 13:55:42 +0300 |
| commit | ed667e344d7e9f72f2b1a0302e241606276a06ae (patch) | |
| tree | cc2e575443861d285b99c58434ddd7282b237cad /intern/cycles/blender/blender_sync.cpp | |
| parent | 9a7dc41dd9b9803c30eb24bc74927a312b40ba4d (diff) | |
| parent | 26481eabe1e66da2a322190f15ad600d9d69bbee (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index aea601480bf..b6a5f67ec2d 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -697,9 +697,15 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay, } } - RNA_BEGIN (&crl, b_aov, "aovs") { - bool is_color = (get_enum(b_aov, "type") == 1); - string name = get_string(b_aov, "name"); + BL::ViewLayer::aovs_iterator b_aov_iter; + for (b_view_layer.aovs.begin(b_aov_iter); b_aov_iter != b_view_layer.aovs.end(); ++b_aov_iter) { + BL::AOV b_aov(*b_aov_iter); + if (!b_aov.is_valid()) { + continue; + } + + string name = b_aov.name(); + bool is_color = b_aov.type() == BL::AOV::type_COLOR; if (is_color) { b_engine.add_pass(name.c_str(), 4, "RGBA", b_view_layer.name().c_str()); @@ -710,7 +716,6 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay, Pass::add(PASS_AOV_VALUE, passes, name.c_str()); } } - RNA_END; scene->film->set_denoising_data_pass(denoising.use || denoising.store_passes); scene->film->set_denoising_clean_pass(scene->film->get_denoising_flags() & |