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-636 always use the same folder to load layers #3380

Merged
merged 1 commit into from
Oct 13, 2023
Merged

EMSUSD-636 always use the same folder to load layers #3380

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
13 changes: 8 additions & 5 deletions plugin/adsk/scripts/mayaUsd_layerEditorFileDialogs.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

// global used to store parent layer's directory to be used in usdRootFileRelative.uiInit
global string $gLayerParentPathUsdLayerEditorSaveFileDialog = "";
global string $gLayerParentPathUsdLayerEditorLoadFileDialog = "";

///////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -164,12 +165,14 @@ global proc UsdLayerEditor_LoadLayersFileDialogOptions_UICreate(string $parent)

global proc UsdLayerEditor_LoadLayersFileDialogOptions_UIInit(string $parent, string $filterType)
{
global string $gLayerParentPathUsdLayerEditorSaveFileDialog;
python("import mayaUsd_USDRootFileRelative as murel\nmurel.usdSubLayerFileRelative.uiInit('" + $parent + "', '" + $filterType + "', '" + $gLayerParentPathUsdLayerEditorSaveFileDialog + "')");
global string $gLayerParentPathUsdLayerEditorLoadFileDialog;
python("import mayaUsd_USDRootFileRelative as murel\nmurel.usdSubLayerFileRelative.uiInit('" + $parent + "', '" + $filterType + "', '" + $gLayerParentPathUsdLayerEditorLoadFileDialog + "')");
}

global proc UsdLayerEditor_LoadLayersFileDialogOptions_UICommit(string $parent, string $selectedFile)
{
optionVar -stringValue usdMayaLoadLayersFolder $selectedFile;

python("import mayaUsd_USDRootFileRelative as murel\nmurel.usdSubLayerFileRelative.uiCommit('" + $parent + "', '" + $selectedFile + "')");
}

Expand All @@ -186,8 +189,8 @@ global proc UsdLayerEditor_LoadLayersFileDialogOptions_FileTypeChanged(string $p
global proc string[] UsdLayerEditor_LoadLayersFileDialog(string $title, string $folder)
{
// Always set parent path to empty to hide the file preview
global string $gLayerParentPathUsdLayerEditorSaveFileDialog;
$gLayerParentPathUsdLayerEditorSaveFileDialog = "";
global string $gLayerParentPathUsdLayerEditorLoadFileDialog;
$gLayerParentPathUsdLayerEditorLoadFileDialog = "";

string $fileFilter = python("from mayaUsdUtils import getUSDDialogFileFilters; getUSDDialogFileFilters(False)");
$okCaption = getMayaUsdString("kLoad");
Expand All @@ -202,7 +205,7 @@ global proc string[] UsdLayerEditor_LoadLayersFileDialog(string $title, string $
-optionsUICommit2 "UsdLayerEditor_LoadLayersFileDialogOptions_UICommit"
-fileTypeChanged "UsdLayerEditor_LoadLayersFileDialogOptions_FileTypeChanged"
-selectionChanged "UsdLayerEditor_LoadLayersFileDialogOptions_SelectionChanged"
-startingDirectory $folder
-startingDirectory $gLayerParentPathUsdLayerEditorLoadFileDialog
`;

return $result;
Expand Down