Fix merge conflict (AcademySoftwareFoundation#2653)

jstone-lucasfilm · web-flow · commit 443eb5171417 · 2025-10-31T16:26:17.000-07:00
This changelist fixes a merge conflict between two recent changes to OSL shader generation, aligning a method signature in OslNetworkShaderGenerator to match that of its base class.
diff --git a/source/MaterialXGenOsl/OslNetworkShaderGenerator.cpp b/source/MaterialXGenOsl/OslNetworkShaderGenerator.cpp
@@ -25,7 +25,7 @@ OslNetworkShaderGenerator::OslNetworkShaderGenerator(TypeSystemPtr typeSystem) :
 {
 }
 
-ShaderNodeImplPtr OslNetworkShaderGenerator::createShaderNodeImplForImplementation(const NodeDef& /* nodedef */) const
+ShaderNodeImplPtr OslNetworkShaderGenerator::createShaderNodeImplForImplementation(const Implementation& /* implElement */) const
 {
     return OsoNode::create();
 }
diff --git a/source/MaterialXGenOsl/OslNetworkShaderGenerator.h b/source/MaterialXGenOsl/OslNetworkShaderGenerator.h
@@ -36,7 +36,7 @@ class MX_GENOSL_API OslNetworkShaderGenerator : public ShaderGenerator
         return std::make_shared<OslNetworkShaderGenerator>(typeSystem ? typeSystem : TypeSystem::create());
     }
 
-    ShaderNodeImplPtr createShaderNodeImplForImplementation(const NodeDef& nodedef) const override;
+    ShaderNodeImplPtr createShaderNodeImplForImplementation(const Implementation& implElement) const override;
 
     /// Return a unique identifier for the target this generator is for
     const string& getTarget() const override { return TARGET; }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ OslNetworkShaderGenerator::OslNetworkShaderGenerator(TypeSystemPtr typeSystem) :`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
`28`		`-ShaderNodeImplPtr OslNetworkShaderGenerator::createShaderNodeImplForImplementation(const NodeDef& /* nodedef */) const`
	`28`	`+ShaderNodeImplPtr OslNetworkShaderGenerator::createShaderNodeImplForImplementation(const Implementation& /* implElement */) const`
`29`	`29`	`{`
`30`	`30`	`return OsoNode::create();`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class MX_GENOSL_API OslNetworkShaderGenerator : public ShaderGenerator`
`36`	`36`	`return std::make_shared<OslNetworkShaderGenerator>(typeSystem ? typeSystem : TypeSystem::create());`
`37`	`37`	`}`
`38`	`38`
`39`		`- ShaderNodeImplPtr createShaderNodeImplForImplementation(const NodeDef& nodedef) const override;`
	`39`	`+ ShaderNodeImplPtr createShaderNodeImplForImplementation(const Implementation& implElement) const override;`
`40`	`40`
`41`	`41`	`/// Return a unique identifier for the target this generator is for`
`42`	`42`	`const string& getTarget() const override { return TARGET; }`