Merge pull request #1328 from johnhaddon/usd2302

Compatibility with USD 23.02

Author: johnhaddon

contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp

@@ -82,6 +82,7 @@ IECORE_POP_DEFAULT_VISIBILITY
 #include "tbb/concurrent_hash_map.h"
 
 #include <iostream>
+#include <mutex>
 
 using namespace IECore;
 using namespace IECoreScene;

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -2482,7 +2482,7 @@ def assertAttributesValues( sphere ):
 
 		# Check that the USD file written looks as expected
 		stage = pxr.Usd.Stage.Open( fileName )
-		sphereUsd = pxr.UsdGeom.Imageable( stage.GetPrimAtPath( "/sphere" ) )
+		sphereUsd = pxr.UsdGeom.PrimvarsAPI( stage.GetPrimAtPath( "/sphere" ) )
 		self.assertEqual( sphereUsd.GetPrim().GetAttribute( "customNamespaced:testAnimated" ).Get( 0 ), 0 )
 		self.assertEqual( sphereUsd.GetPrimvar( "test" ).Get( 0 ), "cyan" )
 		self.assertEqual( sphereUsd.GetPrimvar( "user:bongo" ).Get( 0 ), "cyan" )
@@ -2491,7 +2491,7 @@ def assertAttributesValues( sphere ):
 		self.assertEqual( sphereUsd.GetPrim().GetAttribute( "radius" ).Get( 0 ), 10 )
 		self.assertEqual( sphereUsd.GetPrim().GetAttribute( "studio:foo" ).Get( 0 ), "brown" )
 
-		abUsd = pxr.UsdGeom.Imageable( stage.GetPrimAtPath( "/ab" ) )
+		abUsd = pxr.UsdGeom.PrimvarsAPI( stage.GetPrimAtPath( "/ab" ) )
 		self.assertEqual( abUsd.GetPrimvar( "bar" ).Get( 0 ), "black" )
 		self.assertEqual( abUsd.GetPrimvar( "bar" ).GetAttr().GetMetadata( "cortex_isConstantPrimitiveVariable" ), True )
 		self.assertEqual( abUsd.GetPrimvar( "notUserPrefixAttribute" ).Get( 0 ), "orange" )