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

Improve edit as maya context menu #2023

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Improve edit as maya context menu #2023

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: 1 addition & 1 deletion lib/mayaUsd/fileio/primUpdaterManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace {
const std::string kPullParentPathKey("Maya:Pull:ParentPath");

// Set name that will be used to hold all pulled objects
const MString kPullSetName("pullStateSet");
const MString kPullSetName("usdEditAsMaya");

// Metadata key used to store pull information on a prim
const TfToken kPullPrimMetadataKey("Maya:Pull:DagPath");
Expand Down
52 changes: 41 additions & 11 deletions plugin/adsk/scripts/mayaUsdMenu.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,16 +559,45 @@ proc termAEShowMenu()
// initPullMenu
// Marking menu with USD options for DAG objects

proc int isPulledUsdObject(string $dagObject) {
string $pullAttribute = ( $dagObject + ".Pull_UfePath" );
if (`attributeExists "Pull_UfePath" $dagObject`) {
string $ufePath = `getAttr $pullAttribute`;
if ($ufePath != "") {
return 1;
proc string getPulledUsdObject(string $dagObject) {
string $root = "";
string $pulledDagObject = "";

if (`objExists $dagObject`) {
// For some reason, outliner will provide a set instead of real
// selection when populating the menu under set. We go back to read the
// real selection
if (size(`ls -set $dagObject`) > 0) {
string $selection[] = `ls -sl`;
$dagObject = $selection[0];
}
if (size(`ls -dagObjects $dagObject`) > 0) {
for (;;) {
string $parents[] = `listRelatives -parent -fullPath $dagObject`;
if (size($parents) == 0) {
$root = longNameOf($dagObject);
break;
}

// Not root, then maybe it's pulled object. Look for "metadata" attribute
if (`attributeExists "Pull_UfePath" $dagObject`) {
string $pullAttribute = ( $dagObject + ".Pull_UfePath" );
string $ufePath = `getAttr $pullAttribute`;
if ($ufePath != "") {
$pulledDagObject = $dagObject;
}
}

$dagObject = $parents[0];
}
}
}

return 0;
if ($root == "|__mayaUsd__" && $pulledDagObject != "") {
return $pulledDagObject;
}

return "";
}

proc int isObjectSelected(string $obj)
Expand Down Expand Up @@ -618,10 +647,11 @@ global proc mayaUsdMenu_markingMenuCallback( string $obj )
{
if (!hasPrimUpdater())
return;

if (isPulledUsdObject($obj)) {
string $pushback = `menuItem -label "Merge Maya Edits to USD" -insertAfter "" -image "merge_to_USD.png" -command ("mayaUsdMenu_pushBackToUSD " + $obj)`;
string $pushclear = `menuItem -label "Discard Maya Edits" -insertAfter $pushback -image "discard_edits.png" -command ("mayaUsdDiscardEdits " + $obj)`;

string $pulledObject = getPulledUsdObject($obj);
if ($pulledObject != "") {
string $pushback = `menuItem -label "Merge Maya Edits to USD" -insertAfter "" -image "merge_to_USD.png" -command ("mayaUsdMenu_pushBackToUSD " + $pulledObject)`;
string $pushclear = `menuItem -label "Discard Maya Edits" -insertAfter $pushback -image "discard_edits.png" -command ("mayaUsdDiscardEdits " + $pulledObject)`;
menuItem -divider true -insertAfter $pushclear;
}
else {
Expand Down