Skip to content

Commit

Permalink
Merge branch 'master' into issue_1769
Browse files Browse the repository at this point in the history
  • Loading branch information
cpichard authored Jan 5, 2024
2 parents d6b5346 + bce167f commit 2b66a9c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
- [usd#1772](https://github.com/Autodesk/arnold-usd/issues/1772) - RectLight texture uvs are now consistent between husk, kick and other renderers.
- [usd#1776](https://github.com/Autodesk/arnold-usd/issues/1776) - Fix incorrect PointInstancer instance orientations in the render delegate.
- [usd#1769](https://github.com/Autodesk/arnold-usd/issues/1769) - Fix curve uvs when they are vertex interpolated.
- [usd#1784](https://github.com/Autodesk/arnold-usd/issues/1784) - The aov layer name is now correctly taken into account when rendering exrs with husk and using the arnold productType.


## [7.2.5.0] - 2023-12-13

Expand All @@ -32,7 +34,6 @@
- [usd#1524](https://github.com/Autodesk/arnold-usd/issues/1524) - Fix material binding on instances under a SkelRoot
- [usd#1718](https://github.com/Autodesk/arnold-usd/issues/1718) - Support primvars:arnold attributes in Arnold typed schemas


## [7.2.4.1] - 2023-10-18

### Bugfix
Expand Down
12 changes: 7 additions & 5 deletions libs/render_delegate/render_pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -932,11 +932,13 @@ void HdArnoldRenderPass::_Execute(const HdRenderPassStateSharedPtr& renderPassSt
// Check if the AOV has a specific filter
const auto arnoldAovFilterName = _GetOptionalSetting<std::string>(renderVar.settings, _tokens->aovSettingFilter, "");
AtNode *aovFilterNode = arnoldAovFilterName.empty() ? nullptr : _CreateFilter(_renderDelegate, renderVar.settings, ++filterIndex);
customRenderVar.output =
AtString{TfStringPrintf(
arnoldTypes.isHalf ? "%s %s %s %s HALF": "%s %s %s %s", aovName.c_str(), arnoldTypes.outputString, aovFilterNode ? AiNodeGetName(aovFilterNode) : filterName,
customDriverName.c_str())
.c_str()};
std::string output = TfStringPrintf(
"%s %s %s %s", aovName.c_str(), arnoldTypes.outputString, aovFilterNode ? AiNodeGetName(aovFilterNode) : filterName,
customDriverName.c_str());
if (!renderVar.name.empty() && renderVar.name != renderVar.sourceName) {
output += TfStringPrintf(" %s", renderVar.name.c_str());
}
customRenderVar.output = AtString{output.c_str()};
}
tolerance += 1;
enableFiltering += 1;
Expand Down

0 comments on commit 2b66a9c

Please sign in to comment.