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

MAYA-120831: Always use Namespaces when creating a Maya Reference #2004

Merged
merged 2 commits into from
Jan 20, 2022
Merged

MAYA-120831: Always use Namespaces when creating a Maya Reference #2004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d7fc9a
MAYA-120831: As a user, I always want to use Namespaces when creating…
seando-adsk Jan 19, 2022
0069f2b
MAYA-120831: As a user, I always want to use Namespaces when creating…
seando-adsk Jan 20, 2022
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
86 changes: 14 additions & 72 deletions lib/mayaUsd/resources/scripts/mayaUsdAddMayaReference.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,13 @@ proc fileOptionsTabPage(string $tabLayout)
-cc ("fo_changeReferenceNamespaceOption(\"" + $action + "\")")
-annotation `uiRes("m_fileOptions.kNamespacesEnsureUniqueNodeNames")`
useNamespacesGrp;
//All offlineMode is in namespace, so we set the useNamespacesGrp be true and gray
frameLayout -edit -expandCommand ("fo_NamespaceOptionExpand(\"" + $action + "\")") namespaceOptionFrame;

// For Usd Add Maya Reference we always want the "use namespaces" option to be true.
// So hide this checkbox.
// Note: we must leave all the controls for the case where the "Use Namespaces" option
// is off as the callbacks in Maya expect the controls to be there.
checkBoxGrp -edit -v1 true -manage false -visible false useNamespacesGrp;
frameLayout -edit -expandCommand ("fo_NamespaceOptionExpand(\"" + $action + "\"); checkBoxGrp -edit -v1 true -manage false -visible false useNamespacesGrp") namespaceOptionFrame;

/*
------------------------------------------------------------------------------------------------
Expand All @@ -261,28 +266,9 @@ proc fileOptionsTabPage(string $tabLayout)
-af nodeNamePrefix top 0
-ac nodeNamePrefix left 3 nameClash2OptionMenu
nameClashForm;

// Trying to concatenate uiRes() strings in a single statement generates a
// syntax error.
string $prefixesMsg = `uiRes("m_fileOptions.kPrefixesMsg1")` +
`uiRes("m_fileOptions.kPrefixesMsg2")` +
`uiRes("m_fileOptions.kPrefixesMsg3")`;

text
//-align "center"
-label $prefixesMsg
prefixesObsoleteLabel;

string $namespaceOptionVar = "referenceUseNamespacesDuringFileIO";
int $useNS = (`optionVar -query $namespaceOptionVar`);
if ($useNS)
{
text -e -visible false prefixesObsoleteLabel;
}
else
{
text -e -visible true prefixesObsoleteLabel;
}

// Need this text field as it is referenced by Maya callbacks.
text -visible false prefixesObsoleteLabel;

/*
------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -354,7 +340,7 @@ proc fileOptionsTabPage(string $tabLayout)
//Fill the treeView anyway.
namespaceTreeView_update($gFileOptionTreeViewName, "");

refreshNamespaceOptions($useNS, $action);
refreshNamespaceOptions(true, $action);

setParent $topForm;

Expand Down Expand Up @@ -403,9 +389,6 @@ proc setOptionVars(int $forceFactorySettings)
optionVar -stringValue usdMayaReferenceVariantNameText $def;
}

if ($forceFactorySettings || !`optionVar -exists referenceUseNamespacesDuringFileIO`) {
optionVar -intValue referenceUseNamespacesDuringFileIO true;
}
if ($forceFactorySettings || !`optionVar -exists referenceOptionsUseRenamePrefix`) {
optionVar -intValue referenceOptionsUseRenamePrefix false;
}
Expand Down Expand Up @@ -475,7 +458,6 @@ proc setOptionVars(int $forceFactorySettings)
;

optionVar -init $forceFactorySettings -category $category
-iv referenceUseNamespacesDuringFileIO true
-iv referenceOptionsUseRenamePrefix false
-sv referenceOptionsRenamePrefix ""
-iv referenceOptionsLockReference false
Expand Down Expand Up @@ -653,43 +635,20 @@ proc fileOptionsSetup(string $parent, int $forceFactorySettings, string $chosenF
-v1 `optionVar -query fileReferenceReserveNamespaces`
($action + "fo_reserveNamespacesGrp");

string $namespaceOptionVar = "referenceUseNamespacesDuringFileIO";
int $useNS = `optionVar -query $namespaceOptionVar`;
checkBoxGrp -edit -v1 $useNS useNamespacesGrp;
fo_changeReferenceNamespaceOption( $action );

if(`text -exists prefixesObsoleteLabel`) {
int $notUseNS = !$useNS;
text -e -visible $notUseNS prefixesObsoleteLabel;
}

string $fileType = ("" == $chosenFileType) ?
`optionVar -q defaultFileReferenceType` : $chosenFileType;

int $userPrefix = 0;
string $usePrefixOptionVar = "referenceOptionsUseRenamePrefix";
$userPrefix = `optionVar -q $usePrefixOptionVar `;

int $isUseNS = `optionVar -query $namespaceOptionVar`;
// Only non namespace mode uses nameClash2OptionMenu. Set its menu Item via
// $userPrefix
if(!$isUseNS)
{
optionMenu -e -select ($userPrefix + 1) nameClash2OptionMenu;
}

if ($userPrefix)
{
string $renamePrefixOptionVar = "referenceOptionsRenamePrefix";
string $userPrefixStr = `optionVar -q $renamePrefixOptionVar`;
if($isUseNS)
{
textField -e -tx $userPrefixStr nodeNamePrefixInNamespace;
}
else
{
textField -e -tx $userPrefixStr nodeNamePrefix;
}
textField -e -tx $userPrefixStr nodeNamePrefixInNamespace;
}
fo_prefixName ($action);

Expand Down Expand Up @@ -824,10 +783,6 @@ global proc addMayaReferenceToUsdUiCb(string $parent, string $selectedFile)
}

// First find out what the user has given us.
int $useNS = `checkBoxGrp -q -v1 useNamespacesGrp`;
string $namespaceOptionVar = "referenceUseNamespacesDuringFileIO";
optionVar -intValue $namespaceOptionVar $useNS;

int $lockItGood = `checkBoxGrp -q -v1 referenceLockReferenceGrp`;
string $referenceOptionsLockReferenceVar = "referenceOptionsLockReference";
optionVar -intValue $referenceOptionsLockReferenceVar $lockItGood;
Expand All @@ -854,7 +809,7 @@ global proc addMayaReferenceToUsdUiCb(string $parent, string $selectedFile)

int $radioExist = `radioCollection -exists namespaceRadioCollection`;
int $useNamePrefix = 1;
if($useNS)
if (true) // Use namespaces
{
if($radioExist)
{
Expand All @@ -865,10 +820,6 @@ global proc addMayaReferenceToUsdUiCb(string $parent, string $selectedFile)
}
}
}
else
{
$useNamePrefix = `optionMenu -q -sl nameClash2OptionMenu`;
}

string $usePrefixOptionVar = "referenceOptionsUseRenamePrefix";
if ($useNamePrefix == 1) {
Expand All @@ -879,8 +830,7 @@ global proc addMayaReferenceToUsdUiCb(string $parent, string $selectedFile)

//Get namePrefix and workingNamespace from controls.
string $namePrefix;
$namespaceOptionVar = "referenceUseNamespacesDuringFileIO";
if( $useNS )
if( true ) // Use namespaces
{
//Set prefix name,
string $useNSString = `radioCollection -q -select namespaceRadioCollection`;
Expand All @@ -894,14 +844,6 @@ global proc addMayaReferenceToUsdUiCb(string $parent, string $selectedFile)
string $selectedNS = getlFullNamespaceFromTreeView();
optionVar -stringValue fileWorkingNamespaceName $selectedNS;
}
else
{
if($useNamePrefix)
{
$namePrefix = `textField -q -tx nodeNamePrefix`;
}
//else do nothing for not using name prefix
}

if (size($namePrefix) > 0) {
string $renamePrefixOptionVar = "referenceOptionsRenamePrefix";
Expand Down