Merge pull request #4037 from dj-mcg/pr/Fix_Python_Wrappings

Fix UsdMayaPrimWriter and UsdMayaPrimReader Python Wrappings
Autodesk · Dec 11, 2024 · 94ed067 · 94ed067
2 parents e56cdc5 + 29fc5fa
commit 94ed067
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/mayaUsd/python/wrapPrimReader.cpp b/lib/mayaUsd/python/wrapPrimReader.cpp
@@ -38,7 +38,7 @@ PXR_NAMESPACE_USING_DIRECTIVE
 template <typename T = UsdMayaPrimReader>
 class PrimReaderWrapper
     : public T
-    , public TfPyPolymorphic<UsdMayaPrimReader>
+    , public TfPyPolymorphic<T>
 {
 public:
     typedef PrimReaderWrapper This;
@@ -580,7 +580,7 @@ void wrapShaderReader()
 
     typedef UsdMayaShaderReader This;
 
-    class_<ShaderReaderWrapper, bases<PrimReaderWrapper<>>, PXR_BOOST_PYTHON_NAMESPACE::noncopyable>
+    class_<ShaderReaderWrapper, bases<UsdMayaPrimReader>, PXR_BOOST_PYTHON_NAMESPACE::noncopyable>
         c("ShaderReader", no_init);
 
     scope s(c);

diff --git a/lib/mayaUsd/python/wrapPrimWriter.cpp b/lib/mayaUsd/python/wrapPrimWriter.cpp
@@ -38,7 +38,7 @@ PXR_NAMESPACE_USING_DIRECTIVE
 template <typename T = UsdMayaPrimWriter>
 class PrimWriterWrapper
     : public T
-    , public TfPyPolymorphic<UsdMayaPrimWriter>
+    , public TfPyPolymorphic<T>
 {
 public:
     typedef PrimWriterWrapper This;
@@ -99,7 +99,7 @@ class PrimWriterWrapper
     const SdfPathVector& default_GetModelPaths() const { return base_t::GetModelPaths(); }
     const SdfPathVector& GetModelPaths() const override
     {
-        if (Override o = GetOverride("GetModelPaths")) {
+        if (TfPyOverride o = this->GetOverride("GetModelPaths")) {
             auto res = std::function<PXR_BOOST_PYTHON_NAMESPACE::object()>(
                 TfPyCall<PXR_BOOST_PYTHON_NAMESPACE::object>(o))();
             if (res) {
@@ -131,7 +131,7 @@ class PrimWriterWrapper
     }
     const UsdMayaUtil::MDagPathMap<SdfPath>& GetDagToUsdPathMapping() const override
     {
-        if (Override o = GetOverride("GetDagToUsdPathMapping")) {
+        if (TfPyOverride o = this->GetOverride("GetDagToUsdPathMapping")) {
             auto res = std::function<PXR_BOOST_PYTHON_NAMESPACE::object()>(
                 TfPyCall<PXR_BOOST_PYTHON_NAMESPACE::object>(o))();
             if (res) {
@@ -735,7 +735,7 @@ void wrapShaderWriter()
 {
     PXR_BOOST_PYTHON_NAMESPACE::class_<
         ShaderWriterWrapper,
-        PXR_BOOST_PYTHON_NAMESPACE::bases<PrimWriterWrapper<>>,
+        PXR_BOOST_PYTHON_NAMESPACE::bases<UsdMayaPrimWriter>,
         PXR_BOOST_PYTHON_NAMESPACE::noncopyable>
         c("ShaderWriter", PXR_BOOST_PYTHON_NAMESPACE::no_init);