Disable edit as Maya for materials.

lib/usd/translators/plugInfo.json

@@ -27,6 +27,7 @@
             },
             "PrimUpdater": {
               "providesTranslator": [
+                "UsdShadeMaterial",
                 "MayaUsd_SchemasALMayaReference",
                 "MayaUsd_SchemasMayaReference"
               ]

lib/usd/translators/shading/CMakeLists.txt

@@ -35,6 +35,14 @@ if (MAYA_APP_VERSION VERSION_GREATER_EQUAL 2020)
     )
 endif()
 
+# Edit as Maya requires UFE path mapping.
+if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
+    target_sources(${TARGET_NAME}
+        PRIVATE
+            materialUpdater.cpp
+    )
+endif()
+
 # These import/export classes will work with older versions of Maya and USD if
 # you plan to render in usdView or other MaterialX-aware renderers. However,
 # getting these materials to appear in the Maya viewport when creating a USD

lib/usd/translators/shading/materialUpdater.cpp

@@ -0,0 +1,46 @@
+//
+// Copyright 2022 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "materialUpdater.h"
+
+#include "shadingTokens.h"
+
+#include <mayaUsd/fileio/primUpdaterRegistry.h>
+
+#include <pxr/pxr.h>
+#include <pxr/usd/usdShade/material.h>
+
+#include <basePxrUsdPreviewSurface/usdPreviewSurface.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+PXRUSDMAYA_REGISTER_UPDATER(
+    UsdShadeMaterial,
+    usdPreviewSurface,
+    MaterialUpdater,
+    UsdMayaPrimUpdater::Supports::Invalid);
+
+MaterialUpdater::MaterialUpdater(
+    const UsdMayaPrimUpdaterContext& context,
+    const MFnDependencyNode&         depNodeFn,
+    const Ufe::Path&                 path)
+    : UsdMayaPrimUpdater(context, depNodeFn, path)
+{
+}
+
+/* virtual */
+bool MaterialUpdater::canEditAsMaya() const { return false; }
+
+PXR_NAMESPACE_CLOSE_SCOPE

lib/usd/translators/shading/materialUpdater.h

@@ -0,0 +1,39 @@
+//
+// Copyright 2022 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#pragma once
+
+#include <mayaUsd/fileio/primUpdater.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class MaterialUpdater : public UsdMayaPrimUpdater
+{
+public:
+    MAYAUSD_CORE_PUBLIC
+    MaterialUpdater(
+        const UsdMayaPrimUpdaterContext& context,
+        const MFnDependencyNode&         depNodeFn,
+        const Ufe::Path&                 path);
+
+    /// As of 16-Sep-2022, prims of type Material cannot be pulled by
+    /// themselves, so this method returns false.  Materials can only be edited
+    /// as Maya when associated with pulled Dag nodes.  This may change in
+    /// future versions of maya-usd.
+    MAYAUSD_CORE_PUBLIC
+    bool canEditAsMaya() const override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE

test/lib/mayaUsd/fileio/testEditAsMaya.py

@@ -19,7 +19,6 @@
 import fixturesUtils
 
 from usdUtils import createSimpleXformScene
-from ufeUtils import ufeFeatureSetVersion
 
 from maya import OpenMaya as OM
 from maya import OpenMayaAnim as OMA
@@ -65,7 +64,6 @@ def tearDownClass(cls):
     def setUp(self):
         cmds.file(new=True, force=True)
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testCannotEditAsMayaAnAncestor(self):
         '''Test that trying to edit an ancestor is not allowed.'''
 
@@ -82,7 +80,6 @@ def testCannotEditAsMayaAnAncestor(self):
             self.assertFalse(mayaUsd.lib.PrimUpdaterManager.canEditAsMaya(aUsdUfePathStr))
             self.assertFalse(mayaUsd.lib.PrimUpdaterManager.editAsMaya(aUsdUfePathStr))
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testEditAsMayaPreserveTimeline(self):
         '''Test that edit does not change the timeline start and end.'''
 
@@ -114,7 +111,6 @@ def verifyTimeline():
 
         verifyTimeline()
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testTransformEditAsMaya(self):
         '''Edit a USD transform as a Maya object.'''
 
@@ -164,7 +160,6 @@ def testTransformEditAsMaya(self):
 
         assertVectorAlmostEqual(self, mayaValues, usdValues)
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testEditAsMayaUndoRedo(self):
         '''Edit a USD transform as a Maya object and apply undo and redo.'''
 
@@ -286,7 +281,6 @@ def testEditAsMayaUIInfo(self):
         self.assertEqual('', icon.baseIcon)
         self.assertEqual(ufe.UIInfoHandler.Disabled, icon.mode)
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testIllegalEditAsMaya(self):
         '''Trying to edit as Maya on object that doesn't support it.'''
 
@@ -296,6 +290,8 @@ def testIllegalEditAsMaya(self):
         stage = mayaUsd.lib.GetPrim(proxyShapePathStr).GetStage()
         blendShape = stage.DefinePrim('/BlendShape1', 'BlendShape')
         scope = stage.DefinePrim('/Scope1', 'Scope')
+        scope = stage.DefinePrim('/Mesh1', 'Mesh')
+        scope = stage.DefinePrim('/Material1', 'Material')
 
         blendShapePathStr = proxyShapePathStr + ',/BlendShape1'
         scopePathStr = proxyShapePathStr + ',/Scope1'
@@ -312,8 +308,14 @@ def testIllegalEditAsMaya(self):
         # with mayaUsd.lib.OpUndoItemList():
         #     self.assertFalse(mayaUsd.lib.PrimUpdaterManager.canEditAsMaya(scopePathStr))
         #     self.assertFalse(mayaUsd.lib.PrimUpdaterManager.editAsMaya(scopePathStr))
+
+        # Mesh can be edited as Maya.
+        self.assertTrue(mayaUsd.lib.PrimUpdaterManager.canEditAsMaya(proxyShapePathStr + ',/Mesh1'))
+
+        # Material cannot be edited as Maya: it explicitly disables this
+        # capability.
+        self.assertFalse(mayaUsd.lib.PrimUpdaterManager.canEditAsMaya(proxyShapePathStr + ',/Material1'))
 
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testSessionLayer(self):
         '''Verify that the edit gets on the sessionLayer instead of the editTarget layer.'''
 
@@ -345,8 +347,6 @@ def testSessionLayer(self):
 
         self.assertEqual(prim.GetCustomDataByKey(kPullPrimMetadataKey), None)
 
-
-    @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')
     def testTargetLayer(self):
         '''Verify that the target layer is not moved after Edit As Maya.'''