Merge pull request #1699 from Autodesk/boudrey/MAYA-113469/register

Boudrey/maya 113469/register
Autodesk · Sep 16, 2021 · 0c906e8 · 0c906e8
2 parents 1ce152e + 4b06569
commit 0c906e8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/lib/mayaUsd/python/wrapAdaptor.cpp b/lib/mayaUsd/python/wrapAdaptor.cpp
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <mayaUsd/fileio/registryHelper.h>
 #include <mayaUsd/fileio/utils/adaptor.h>
 #include <mayaUsd/utils/undoHelperCommand.h>
 #include <mayaUsd/utils/util.h>
@@ -173,6 +174,20 @@ static std::string _AttributeAdaptor__repr__(const UsdMayaAdaptor::AttributeAdap
     }
 }
 
+static void RegisterTypedSchemaConversion(const std::string& nodeTypeName, const TfType& usdType)
+{
+    UsdMaya_RegistryHelper::g_pythonRegistry = true;
+    UsdMayaAdaptor::RegisterTypedSchemaConversion(nodeTypeName, usdType);
+    UsdMaya_RegistryHelper::g_pythonRegistry = false;
+}
+
+static void RegisterAttributeAlias(const TfToken& attributeName, const std::string& alias)
+{
+    UsdMaya_RegistryHelper::g_pythonRegistry = true;
+    UsdMayaAdaptor::RegisterAttributeAlias(attributeName, alias);
+    UsdMaya_RegistryHelper::g_pythonRegistry = false;
+}
+
 void wrapAdaptor()
 {
     typedef UsdMayaAdaptor This;
@@ -216,10 +231,12 @@ void wrapAdaptor()
                   &This::GetRegisteredTypedSchemas,
                   return_value_policy<TfPySequenceToList>())
               .staticmethod("GetRegisteredTypedSchemas")
-              .def("RegisterAttributeAlias", &This::RegisterAttributeAlias)
+              .def("RegisterAttributeAlias", &::RegisterAttributeAlias)
               .staticmethod("RegisterAttributeAlias")
               .def("GetAttributeAliases", &This::GetAttributeAliases)
-              .staticmethod("GetAttributeAliases");
+              .staticmethod("GetAttributeAliases")
+              .def("RegisterTypedSchemaConversion", &::RegisterTypedSchemaConversion)
+              .staticmethod("RegisterTypedSchemaConversion");
 
     class_<This::SchemaAdaptor>("SchemaAdaptor")
         .def(!self)

diff --git a/lib/mayaUsd/python/wrapOpenMaya.cpp b/lib/mayaUsd/python/wrapOpenMaya.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2016 Pixar
+// Copyright 2021 Autodesk
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/test/lib/mayaUsd/fileio/testShaderWriter.py b/test/lib/mayaUsd/fileio/testShaderWriter.py
@@ -39,11 +39,6 @@ def PostExport(self):
          print("shaderWriterTest.PostExport called")
          return False
 
-class shaderReaderTest(mayaUsdLib.ShaderReader):
-    def HasPostReadSubtree(self):
-         print("shaderReaderTest.HasPostReadSubtree called")
-         return False
-
 class testShaderWriter(unittest.TestCase):
     @classmethod
     def setUpClass(cls):

diff --git a/test/lib/usd/translators/testUsdMayaAdaptor.py b/test/lib/usd/translators/testUsdMayaAdaptor.py
@@ -302,5 +302,17 @@ def testGetAttributeAliases(self):
                 mayaUsdLib.Adaptor.GetAttributeAliases("subdivisionScheme"),
                 ["USD_ATTR_subdivisionScheme", "USD_subdivisionScheme"])
 
+    def testAdaptorRegistration(self):
+        """Tests Registration Python functions."""
+        mayaUsdLib.Adaptor.RegisterTypedSchemaConversion("polySphere", UsdGeom.Sphere)
+        mayaUsdLib.Adaptor.RegisterAttributeAlias(UsdGeom.Tokens.faceVaryingLinearInterpolation,"USD_RegTest")
+        cmds.file(new=True, force=True)
+        cmds.createNode("polySphere", name="TestSphere")
+        self.assertTrue(
+                mayaUsdLib.Adaptor("TestSphere").GetSchema(UsdGeom.Sphere))
+        self.assertEqual(
+                mayaUsdLib.Adaptor.GetAttributeAliases("faceVaryingLinearInterpolation"),
+                ["USD_ATTR_faceVaryingLinearInterpolation", "USD_RegTest", "USD_faceVaryingLinearInterpolation"])
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)