Skip to content

Commit 14e766d

Browse files
Assign unique names to MDL implementations (#1380)
This change list addresses issue #1354, renaming the implementation elements to unique names.
1 parent 1c9d7ce commit 14e766d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@
614614
<implementation name="IM_mix_vector4_genmdl" nodedef="ND_mix_vector4" sourcecode="math::lerp({{bg}}, {{fg}}, {{mix}})" target="genmdl" />
615615
<implementation name="IM_mix_vector4_vector4_genmdl" nodedef="ND_mix_vector4_vector4" sourcecode="math::lerp({{bg}}, {{fg}}, {{mix}})" target="genmdl" />
616616
<implementation name="IM_mix_surfaceshader_genmdl" nodedef="ND_mix_surfaceshader" sourcecode="mx::stdlib::mx_mix_surfaceshader({{fg}}, {{bg}}, {{mix}})" target="genmdl" />
617-
<implementation name="IM_mix_surfaceshader_genmdl" nodedef="ND_mix_volumeshader" sourcecode="mx::stdlib::mx_mix_volumeshader({{fg}}, {{bg}}, {{mix}})" target="genmdl" />
618-
<implementation name="IM_mix_surfaceshader_genmdl" nodedef="ND_mix_displacementshader" sourcecode="mx::stdlib::mx_mix_displacementshader({{fg}}, {{bg}}, {{mix}})" target="genmdl" />
617+
<implementation name="IM_mix_volumeshader_genmdl" nodedef="ND_mix_volumeshader" sourcecode="mx::stdlib::mx_mix_volumeshader({{fg}}, {{bg}}, {{mix}})" target="genmdl" />
618+
<implementation name="IM_mix_displacementshader_genmdl" nodedef="ND_mix_displacementshader" sourcecode="mx::stdlib::mx_mix_displacementshader({{fg}}, {{bg}}, {{mix}})" target="genmdl" />
619619

620620
<!-- ======================================================================== -->
621621
<!-- Conditional nodes -->

source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ TEST_CASE("GenReference: OSL Reference", "[genreference]")
8181
continue;
8282
}
8383

84-
mx::InterfaceElementPtr interface = nodedef->getImplementation();
84+
mx::InterfaceElementPtr interface = nodedef->getImplementation(generator->getTarget());
8585
if (!interface)
8686
{
8787
logFile << "Skip generating reference for unimplemented node '" << nodeName << "'" << std::endl;

0 commit comments

Comments
 (0)