Skip to content

Commit

Permalink
EMSUSD-1504 fix case of filename when sourcing resource strings.
Browse files Browse the repository at this point in the history
Also, reduce spam in one test due to trying to set-up up-axis when alredy the same axis.
  • Loading branch information
pierrebai-adsk committed Oct 16, 2024
1 parent a2a8207 commit a4af8c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion plugin/adsk/scripts/mayaUSDRegisterStrings.mel
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions test/lib/mayaUsd/nodes/testProxyShapeConversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down

0 comments on commit a4af8c7

Please sign in to comment.