From a4af8c75afe8acc94b41e69daf02e766b1ae4d1e Mon Sep 17 00:00:00 2001 From: Pierre Baillargeon Date: Wed, 16 Oct 2024 09:26:34 -0400 Subject: [PATCH] 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. --- plugin/adsk/scripts/mayaUSDRegisterStrings.mel | 2 +- test/lib/mayaUsd/nodes/testProxyShapeConversion.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin/adsk/scripts/mayaUSDRegisterStrings.mel b/plugin/adsk/scripts/mayaUSDRegisterStrings.mel index 8dd766858f..3153652072 100644 --- 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 index 53a1f2fca9..6292cfdc16 100644 --- 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."""