Merge pull request ImageEngine#1231 from johnhaddon/usdFix

USDScene : Fix compatibility with USD 21.08
ivanimanishi · Feb 4, 2022 · 8882ea1 · 8882ea1
2 parents b4786f2 + 2288e18
commit 8882ea1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp b/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp
@@ -92,6 +92,10 @@ using namespace IECoreUSD;
 #define HasAuthoredValue HasAuthoredValueOpinion
 #endif
 
+#if USD_VERSION < 2011
+#define GetPrimInPrototype GetPrimInMaster
+#endif
+
 namespace
 {
 
@@ -104,7 +108,7 @@ void appendPrimOrMasterPath( const pxr::UsdPrim &prim, IECore::MurmurHash &h )
 {
 	if( prim.IsInstanceProxy() )
 	{
-		append( prim.GetPrimInMaster().GetPrimPath(), h );
+		append( prim.GetPrimInPrototype().GetPrimPath(), h );
 	}
 	else
 	{