USDScene : Fix compatibility with USD 21.08

johnhaddon · yannci · commit 8e2069739cd5 · 2022-04-19T15:10:26.000-07:00
`GetPrimInMaster()` was deprecated in USD 20.11, when `GetPrimInPrototype()` was added. It was removed in USD 21.08.
diff --git a/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp b/contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp
@@ -93,6 +93,10 @@ using namespace IECoreUSD;
 #define HasAuthoredValue HasAuthoredValueOpinion
 #endif
 
+#if USD_VERSION < 2011
+#define GetPrimInPrototype GetPrimInMaster
+#endif
+
 namespace
 {
 
@@ -105,7 +109,7 @@ void appendPrimOrMasterPath( const pxr::UsdPrim &prim, IECore::MurmurHash &h )
 {
 	if( prim.IsInstanceProxy() )
 	{
-		append( prim.GetPrimInMaster().GetPrimPath(), h );
+		append( prim.GetPrimInPrototype().GetPrimPath(), h );
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ using namespace IECoreUSD;`
`93`	`93`	`#define HasAuthoredValue HasAuthoredValueOpinion`
`94`	`94`	`#endif`
`95`	`95`
	`96`	`+#if USD_VERSION < 2011`
	`97`	`+#define GetPrimInPrototype GetPrimInMaster`
	`98`	`+#endif`
	`99`	`+`
`96`	`100`	`namespace`
`97`	`101`	`{`
`98`	`102`
`@@ -105,7 +109,7 @@ void appendPrimOrMasterPath( const pxr::UsdPrim &prim, IECore::MurmurHash &h )`
`105`	`109`	`{`
`106`	`110`	`if( prim.IsInstanceProxy() )`
`107`	`111`	`{`
`108`		`- append( prim.GetPrimInMaster().GetPrimPath(), h );`
	`112`	`+ append( prim.GetPrimInPrototype().GetPrimPath(), h );`
`109`	`113`	`}`
`110`	`114`	`else`
`111`	`115`	`{`