Merge pull request #1435 from dj-mcg/pr/USE_NEW_SCHEMAREGISTRY_API

Pr/use new schemaregistry api
Autodesk · May 27, 2021 · 7a8e6e8 · 7a8e6e8
2 parents b3dd25a + 1ad20a2
commit 7a8e6e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doc/build.md b/doc/build.md
@@ -31,7 +31,7 @@ See Pixar's official github page for instructions on how to build USD: https://g
 
 |               |      ![](images/pxr.png)          |        
 |:------------: |:---------------:                  |
-|  CommitID/Tags | release: [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) or [v20.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.08) or [v20.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.11) or [v21.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.02) or [v21.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.05)<br> dev: [d9580db](https://github.com/PixarAnimationStudios/USD/commit/d9580dbec274cc9e6028646582153ca9844527ed) |
+|  CommitID/Tags | release: [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) or [v20.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.08) or [v20.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.11) or [v21.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.02) or [v21.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.05)<br> dev: [2095f6c](https://github.com/PixarAnimationStudios/USD/commit/2095f6cc5ac08b19d6a00308f33c0bbd27cffc35) |
 
 For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below.
 

diff --git a/lib/mayaUsd/resources/ae/usdschemabase/ae_template.py b/lib/mayaUsd/resources/ae/usdschemabase/ae_template.py
@@ -510,7 +510,10 @@ def createAppliedSchemasSection(self):
         schemaAttrsDict = {}
         appliedSchemas = self.prim.GetAppliedSchemas()
         for schema in appliedSchemas:
-            typeAndInstance = Usd.SchemaRegistry().GetTypeAndInstance(schema)
+            if Usd.GetVersion() > (0, 21, 5):
+                typeAndInstance = Usd.SchemaRegistry().GetTypeNameAndInstance(schema)
+            else:
+                typeAndInstance = Usd.SchemaRegistry().GetTypeAndInstance(schema)
             typeName        = typeAndInstance[0]
             schemaType      = Usd.SchemaRegistry().GetTypeFromName(typeName)