Merge pull request #1390 from ivanimanishi/ieBuildFixes

10.5 Build Fixes (for IE)

Author: ivanimanishi

Changes

@@ -1,6 +1,11 @@
 10.5.x.x (relative to 10.5.2.0)
 ========
 
+Build
+---
+
+- SConstruct : Make sure VDB includes can be found
+- USDScene : Fix build for older USD versions
 
 10.5.2.0 (relative to 10.5.1.0)
 ========

SConstruct

@@ -3043,11 +3043,11 @@ if doConfigure :
 		)
 
 		if haveVDB :
+			usdEnv.Prepend( **vdbEnvPrepends )
 			usdEnv.Append(
 				LIBS = [
 					os.path.basename( vdbEnv.subst( "$INSTALL_LIB_NAME" ) ),
 					"${USD_LIB_PREFIX}usdVol",
-					vdbEnv.subst( "openvdb" + env["VDB_LIB_SUFFIX"] )
 				],
 				CPPDEFINES = [ "IECOREUSD_WITH_OPENVDB" ]
 			)

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" )
 	{