USDScene : Fix build for older USD versions

ivanimanishi · ivanimanishi · commit 69662f682f72 · 2023-10-17T08:55:38.000-07:00
diff --git a/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp b/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp
@@ -1206,6 +1206,7 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
 	}
 	else if( const IECoreScene::ShaderNetwork *shaderNetwork = runTimeCast<const ShaderNetwork>( attribute ) )
 	{
+#if PXR_VERSION >= 2111
 		if( name == g_lightAttributeName )
 		{
 			ShaderAlgo::writeLight( shaderNetwork, m_location->prim );
@@ -1215,6 +1216,10 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a
 			const auto &[output, purpose] = materialOutputAndPurpose( name.string() );
 			m_materials[purpose][output] = shaderNetwork;
 		}
+#else
+		const auto &[output, purpose] = materialOutputAndPurpose( name.string() );
+		m_materials[purpose][output] = shaderNetwork;
+#endif
 	}
 	else if( name.string() == "gaffer:globals" )
 	{

Original file line number	Diff line number	Diff line change
`@@ -1206,6 +1206,7 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a`
`1206`	`1206`	`}`
`1207`	`1207`	`else if( const IECoreScene::ShaderNetwork *shaderNetwork = runTimeCast<const ShaderNetwork>( attribute ) )`
`1208`	`1208`	`{`
	`1209`	`+#if PXR_VERSION >= 2111`
`1209`	`1210`	`if( name == g_lightAttributeName )`
`1210`	`1211`	`{`
`1211`	`1212`	`ShaderAlgo::writeLight( shaderNetwork, m_location->prim );`
`@@ -1215,6 +1216,10 @@ void USDScene::writeAttribute( const SceneInterface::Name &name, const Object *a`
`1215`	`1216`	`const auto &[output, purpose] = materialOutputAndPurpose( name.string() );`
`1216`	`1217`	`m_materials[purpose][output] = shaderNetwork;`
`1217`	`1218`	`}`
	`1219`	`+#else`
	`1220`	`+ const auto &[output, purpose] = materialOutputAndPurpose( name.string() );`
	`1221`	`+ m_materials[purpose][output] = shaderNetwork;`
	`1222`	`+#endif`
`1218`	`1223`	`}`
`1219`	`1224`	`else if( name.string() == "gaffer:globals" )`
`1220`	`1225`	`{`