From dbb82ce2fac7d769d2694893a64a79c952416c74 Mon Sep 17 00:00:00 2001 From: cpichard Date: Tue, 26 Sep 2023 15:54:04 +0100 Subject: [PATCH] avoid assigning cryptomatte_filter to cryptomatte aovs (#1697) (cherry picked from commit 5839572973b3f54b71f8ef20e5f89e8e1191b65c) --- CHANGELOG.md | 1 + libs/render_delegate/render_pass.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee92448f0..3251dda414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - [usd#1675](https://github.com/Autodesk/arnold-usd/issues/1675) - Fix UsdUvTexture default wrap modes and uvset coordinates. - [usd#1657](https://github.com/Autodesk/arnold-usd/issues/1657) - Fix a motion blur sampling bug happening when a mesh has facevarying indexed normals and different number of indices per key frame. - [usd#1693](https://github.com/Autodesk/arnold-usd/issues/1693) - Fix geometry light not rendering in recent version. +- [usd#1696](https://github.com/Autodesk/arnold-usd/issues/1696) - Fix cryptomatte render by restoring previous filter assignment to the default filter. ### Build - [usd#1648](https://github.com/Autodesk/arnold-usd/issues/1648) - Fix schemas generation issue that was intermittently failing diff --git a/libs/render_delegate/render_pass.cpp b/libs/render_delegate/render_pass.cpp index 0de284a64e..56a05b1082 100644 --- a/libs/render_delegate/render_pass.cpp +++ b/libs/render_delegate/render_pass.cpp @@ -297,7 +297,7 @@ AtNode* _CreateFilter(HdArnoldRenderDelegate* renderDelegate, const HdAovSetting // We need to make sure that it's holding a string, then try to create it to make sure // it's a node type supported by Arnold. const auto filterType = _GetOptionalSetting(aovSettings, _tokens->aovSettingFilter, std::string{}); - if (filterType.empty()) { + if (filterType.empty() || filterType == "cryptomatte_filter") { return nullptr; } const auto filterNameStr =