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.

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-684 - Labeling of Relative settings may need reworded #3397

Merged
merged 1 commit into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions plugin/adsk/scripts/mayaUSDRegisterStrings.mel
Original file line number Diff line number Diff line change
Expand Up @@ -264,17 +264,17 @@ global proc mayaUSDRegisterStrings()
register("kSaveLayerUsdFileFormatSbm", "Select whether the .usd file is written out in binary or ASCII");
register("kConfirmExistFileSave", "Confirm Save of Existing Files");
register("kSavingMayaSceneFiles", "Save Maya Scene Files");
register("kSaveFileRelatively", "Save Files Relatively");
register("kRelativePathing", "Relative Pathing");
register("kAllRelativeToggle", "All files");
register("kAllRelativeToggleAnn", "When on, all of your files will be saved as relative paths.");
register("kRootLayersRelativeToSceneFile", "USD root layers");
register("kRootLayersRelativeToSceneFileAnn", "When on, your USD root layer file will be saved relatively to your Maya scene file.");
register("kAllRelativeToggleAnn", "When on, all of your files will be written as relative paths.");
register("kRootLayersRelativeToSceneFile", "Root layers");
register("kRootLayersRelativeToSceneFileAnn", "When on, your USD root layer file will be written as relative paths to your Maya scene file.");
register("kSubLayersRelativeToParentLayer", "Sublayers");
register("kSubLayersRelativeToParentLayerAnn", "When on, all sublayers will be saved relatively to their parent layers.");
register("kReferencesRelativeToEditTargetLayer", "References/Payloads");
register("kReferencesRelativeToEditTargetLayerAnn", "When on, any references or payloads will be saved relatively to their respective edit target layer.");
register("kSubLayersRelativeToParentLayerAnn", "When on, all sublayers will be written as relative paths to their parent layers.");
register("kReferencesRelativeToEditTargetLayer", "USD References/payloads");
register("kReferencesRelativeToEditTargetLayerAnn", "When on, any USD references or payloads will be written as relative paths to their respective edit target layer.");
register("kFileDependenciesRelativeToEditTargetLayer", "File dependencies");
register("kFileDependenciesRelativeToEditTargetLayerAnn", "When on, any file dependencies, such as textures or Maya references will be saved relatively to their respective edit target layer.");
register("kFileDependenciesRelativeToEditTargetLayerAnn", "When on, any file dependencies, such as textures or Maya references will be written as relative paths to their respective edit target layer.");

// Register the strings from the python equivalent register function.
// Note: the strings from both the MEL and python register can be loaded
Expand Down
3 changes: 2 additions & 1 deletion plugin/adsk/scripts/mayaUsd_pluginUICreation.mel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ global proc mayaUsd_pluginUICreation()
"mayaUsd_PrefHoldState",
"mayaUsd_PrefSetOptVarsToDefault",
`getMayaUsdString("kUSDPreferences")`,
"USD");
" USD");
// Note: 4 spaces in USD name is important to make it indented in prefs.
mayaUsd_PrefInitOptionVars(false);

source "mayaUsd_fileOptions.mel";
Expand Down
2 changes: 1 addition & 1 deletion plugin/adsk/scripts/mayaUsd_preferenceTab.mel
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ global proc mayaUsd_PrefCreateTab()
usdPrefConfirmExistFileSave;

setParent $parent;
frameLayout -label `getMayaUsdString("kSaveFileRelatively")`;
frameLayout -label `getMayaUsdString("kRelativePathing")`;
columnLayout -adj true;
checkBoxGrp
-ncb 1
Expand Down