Merge pull request #4323 from Autodesk/gamaj/use_nice_names_for_top_level_classifications

Provide nice names to top level NodeDef classifications

Author: seando-adsk

lib/mayaUsd/ufe/UsdShaderNodeDef.cpp

@@ -226,7 +226,7 @@ std::string UsdShaderNodeDef::classification(std::size_t level) const
         if (_shaderNodeDef->GetSourceType() == _tokens->glslfx) {
             return "USD";
         }
-        return _shaderNodeDef->GetSourceType().GetString();
+        return UsdUfe::prettifyName(_shaderNodeDef->GetSourceType().GetString());
     }
 
     return {};

plugin/adsk/plugin/adskMaterialCommands.cpp

@@ -136,7 +136,7 @@ MStatus ADSKMayaUSDGetMaterialsForRenderersCommand::doIt(const MArgList& argList
         auto sourceType = ufeNodeDef->classification(ufeNodeDef->nbClassifications() - 1);
         appendToResult(MString(TfStringPrintf(
                                    "%s/%s|%s",
-                                   UsdUfe::prettifyName(sourceType).c_str(),
+                                   sourceType.c_str(),
                                    UsdUfe::prettifyName(familyName).c_str(),
                                    nodeDef->GetIdentifier().GetText())
                                    .c_str()));

test/lib/ufe/testShaderNodeDef.py

@@ -100,6 +100,10 @@ def testDefinitions(self):
         for mtlxDef in mtlxDefs:
             self.assertTrue(mtlxDef in nodeDefTypes)
 
+        nodeDef = nodeDefHandler.definition("ND_noise2d_color3")
+        self.assertEqual(nodeDef.classification(nodeDef.nbClassifications() - 1), "MaterialX")
+
+
     @unittest.skipUnless(ufeUtils.ufeFeatureSetVersion() >= 4, 'filename and float2 are no longer generic starting with Ufe v4')
     def testDefinitionByType(self):
         type = "ND_image_color3"