From cc613f310bd5d79f4eeff273f4d0d40274a8a1a4 Mon Sep 17 00:00:00 2001 From: Sebastien Blaineau-Ortega Date: Wed, 26 Jul 2023 10:19:00 +0200 Subject: [PATCH] Use static tokens for arnold:format and arnold:filter (#1600) --- libs/render_delegate/render_pass.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/render_delegate/render_pass.cpp b/libs/render_delegate/render_pass.cpp index cdc7e71263..68bb7ac531 100644 --- a/libs/render_delegate/render_pass.cpp +++ b/libs/render_delegate/render_pass.cpp @@ -955,7 +955,7 @@ void HdArnoldRenderPass::_Execute(const HdRenderPassStateSharedPtr& renderPassSt // Querying the data format from USD, with a default value of color3f. // If we have arnold:format defined, we use its value for the format const TfToken hydraFormat = _GetOptionalSetting(renderVar.settings, _tokens->dataType, _GetTokenFromHdFormat(renderVar.format)); - const TfToken arnoldFormat = _GetOptionalSetting(renderVar.settings, TfToken("arnold:format"), TfToken("")); + const TfToken arnoldFormat = _GetOptionalSetting(renderVar.settings, _tokens->arnoldFormat, TfToken("")); const TfToken format = arnoldFormat != TfToken("") ? arnoldFormat : hydraFormat; const auto arnoldTypes = _GetArnoldAOVTypeFromTokenType(format); const auto aovName = _CreateAOV( @@ -963,7 +963,7 @@ void HdArnoldRenderPass::_Execute(const HdRenderPassStateSharedPtr& renderPassSt renderVar.sourceName, customRenderVar.writer, customRenderVar.reader, lightPathExpressions, aovShaders); // Check if the AOV has a specific filter - const auto arnoldAovFilterName = _GetOptionalSetting(renderVar.settings, TfToken("arnold:filter"), ""); + const auto arnoldAovFilterName = _GetOptionalSetting(renderVar.settings, _tokens->aovSettingFilter, ""); AtNode *aovFilterNode = arnoldAovFilterName.empty() ? nullptr : _CreateFilter(_renderDelegate, renderVar.settings); customRenderVar.output = AtString{TfStringPrintf(