Merge pull request #3983 from Autodesk/bailp/EMSUSD-1766/axis-and-uni…

…ts-indent EMSUSD-1766 adjust axis and units section indent
Autodesk · Oct 31, 2024 · 8a634e0 · 8a634e0
2 parents 3b3047b + 9bc067a
commit 8a634e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/plugin/adsk/scripts/mayaUsdTranslatorExport.mel b/plugin/adsk/scripts/mayaUsdTranslatorExport.mel
@@ -1333,6 +1333,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
                 }
 
                 if ($canControlUpAxisAndUnit) {
+                    columnLayout -columnOffset "left" 2;
                     frameLayout -label `getMayaUsdString("kExportAxisAndUnitLbl")` -collapsable true -collapse false axisAndUnitFrameLayout;
                         separator -style "none";
 
@@ -1363,6 +1364,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
                             optionMenuGrp -edit -select 2 unitPopup;
 
                     setParent ..;
+                    setParent ..;
                 }
 
                 separator -style "none";

diff --git a/plugin/adsk/scripts/mayaUsdTranslatorImport.mel b/plugin/adsk/scripts/mayaUsdTranslatorImport.mel
@@ -587,6 +587,7 @@ global proc int mayaUsdTranslatorImport (string $parent,
             checkBoxGrp -label "" -label1 `getMayaUsdString("kImportToInstanceOpt")` -cw 1 $cw1 -value1 1 -ann `getMayaUsdString("kImportToInstanceAnn")` mayaUsdTranslator_ImportInstancesCheckBox;
             separator -style "none";
 
+            columnLayout -columnOffset "left" 2;
             frameLayout -label `getMayaUsdString("kImportAxisAndUnit")` -collapsable true -collapse false axisAndUnitFrameLayout;
                 separator -style "none";
                 checkBoxGrp -label "" -label1 `getMayaUsdString("kImportUpAxis")` -ann `getMayaUsdString("kImportUpAxisAnn")`
@@ -603,6 +604,7 @@ global proc int mayaUsdTranslatorImport (string $parent,
                     menuItem -l `getMayaUsdString("kImportAxisAndUnitOverwritePrefs")` -ann "overwritePrefs";
                 separator -style "none";
             setParent ..;
+            setParent ..;
         setParent ..;
 
         // Now set to current settings.

diff --git a/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel b/plugin/adsk/scripts/mayaUsd_createStageFromFile.mel
@@ -114,7 +114,8 @@ global proc string stageFromFile_UISetup(string $parent)
         excludePrimPathField;
 
     frameLayout -label `getMayaUsdString("kStageAdvancedLabel")` -parent $frame -collapsable true -collapse true advancedSection;
-        frameLayout -label `getMayaUsdString("kStageAxisUnitConversionLabel")` -parent advancedSection -collapsable true -collapse false;
+        columnLayout -columnOffset "left" 2 -parent advancedSection advancedSectionOffset;
+        frameLayout -label `getMayaUsdString("kStageAxisUnitConversionLabel")` -parent advancedSectionOffset -collapsable true -collapse false;
             checkBoxGrp -l `getMayaUsdString("kStageUpAxisLabel")` 
                 -ann `getMayaUsdString("kStageUpAxisAnn")`
                 -value1 1