EMSUSD-1504 fix case of filename when sourcing resource strings.

Also, reduce spam in one test due to trying to set-up up-axis when alredy the same axis.
Autodesk · Oct 16, 2024 · a4af8c7 · a4af8c7
1 parent a2a8207
commit a4af8c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugin/adsk/scripts/mayaUSDRegisterStrings.mel b/plugin/adsk/scripts/mayaUSDRegisterStrings.mel
@@ -28,7 +28,7 @@ global proc mayaUSDRegisterStrings()
     python("import mayaUSDRegisterStrings; mayaUSDRegisterStrings.mayaUSDRegisterStrings()");
 
     // Register the strings from the MayaUsd Lib.
-    source "mayaUSDLibRegisterStrings.mel";
+    source "mayaUsdLibRegisterStrings.mel";
     python("import mayaUsdLibRegisterStrings; mayaUsdLibRegisterStrings.mayaUsdLibRegisterStrings()");
 
     // load any localized resources

diff --git a/test/lib/mayaUsd/nodes/testProxyShapeConversion.py b/test/lib/mayaUsd/nodes/testProxyShapeConversion.py
@@ -50,9 +50,11 @@ def setUp(self):
         """Clear the scene and setup the Maya preferences."""
         cmds.file(f=True, new=True)
         # Make sure up-axis is Z.
-        cmds.upAxis(axis='z')
+        if cmds.upAxis(query=True, axis=True).lower() != 'z':
+            cmds.upAxis(axis='z')
         # Make sure the units are centimeters.
-        cmds.currentUnit(linear='cm')
+        if cmds.currentUnit(query=True, linear=True).lower() != 'cm':
+            cmds.currentUnit(linear='cm')
 
     def testCreateStageChangeUpAxisMayaPrefs(self):
         """Test creating a stage and changing the Maya up-axis preference."""