Merge pull request #1255 from ivanimanishi/usd20Support

ivanimanishi · web-flow · commit 210c4575bdc7 · 2022-03-30T15:05:07.000-07:00
IECoreUSD : Maintain support for USD 20
diff --git a/Changes b/Changes
@@ -1,3 +1,11 @@
+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/SConstruct b/SConstruct
@@ -57,7 +57,7 @@ SConsignFile()
 ieCoreMilestoneVersion = 10 # for announcing major milestones - may contain all of the below
 ieCoreMajorVersion = 3 # backwards-incompatible changes
 ieCoreMinorVersion = 4 # new backwards-compatible features
-ieCorePatchVersion = 0 # bug fixes
+ieCorePatchVersion = 1 # bug fixes
 ieCoreVersionSuffix = "" # used for alpha/beta releases. Example: "a1", "b2", etc.
 
 ###########################################################################################
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`