Merge branch 'RB-10.3' into main

johnhaddon · johnhaddon · commit b7820628a9f6 · 2022-04-01T09:48:23.000+01:00
diff --git a/Changes b/Changes
@@ -36,6 +36,14 @@ Breaking Changes
 - IECoreGL : Removed `PerspectiveCamera.h` header. The implementation was already removed in a Cortex 10.1.0.0 (#1241).
 - StringAlgo : Removed `join()` (#1221).
 
+10.3.4.1 (relative to 10.3.4.0)
+========
+
+Build
+-----
+
+- IECoreUSD : Support for USD 20.??
+
 10.3.4.0 (relative to 10.3.3.0)
 ========
 
diff --git a/contrib/IECoreUSD/src/IECoreUSD/ShaderAlgo.cpp b/contrib/IECoreUSD/src/IECoreUSD/ShaderAlgo.cpp
@@ -44,6 +44,10 @@
 #include "boost/algorithm/string/replace.hpp"
 #include "boost/pointer_cast.hpp"
 
+#if PXR_VERSION < 2102
+#define IsContainer IsNodeGraph
+#endif
+
 namespace
 {
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,10 @@`
`44`	`44`	`#include "boost/algorithm/string/replace.hpp"`
`45`	`45`	`#include "boost/pointer_cast.hpp"`
`46`	`46`
	`47`	`+#if PXR_VERSION < 2102`
	`48`	`+#define IsContainer IsNodeGraph`
	`49`	`+#endif`
	`50`	`+`
`47`	`51`	`namespace`
`48`	`52`	`{`
`49`	`53`