Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EMSUSD-1766 adjust axis and units section indent #3983

Merged
merged 1 commit into from
Oct 31, 2024
Merged

EMSUSD-1766 adjust axis and units section indent #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugin/adsk/scripts/mayaUsdTranslatorExport.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -1363,6 +1364,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
optionMenuGrp -edit -select 2 unitPopup;

setParent ..;
setParent ..;
}

separator -style "none";
Expand Down
2 changes: 2 additions & 0 deletions plugin/adsk/scripts/mayaUsdTranslatorImport.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")`
Expand All @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion plugin/adsk/scripts/mayaUsd_createStageFromFile.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down