Merge branch 'RB-10.3' into main

ivanimanishi · Apr 1, 2022 · b782062 · b782062
2 parents d7b870c + 210c457
commit b782062
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
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
 {