From 27788b46e060f292386797c579edda251413f904 Mon Sep 17 00:00:00 2001
From: Aram Azhari <aram.azhari@autodesk.com>
Date: Mon, 30 Oct 2023 15:43:56 -0400
Subject: [PATCH] EMSUSD-772 - Fixes Edit-As-Maya Option Dialog Not Executing
 Action

EMSUSD-772 - Fixes Edit-As-Maya Option Dialog Not Executing Action
EMSUSD-740 - Updates the "Apply" button's logic to conform with the new design. It should also execute the action.
---
 plugin/adsk/scripts/USDMenuProc.mel | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugin/adsk/scripts/USDMenuProc.mel b/plugin/adsk/scripts/USDMenuProc.mel
index 718c4f88dc..a34a89e754 100644
--- a/plugin/adsk/scripts/USDMenuProc.mel
+++ b/plugin/adsk/scripts/USDMenuProc.mel
@@ -24,6 +24,16 @@ proc string expandToSelection(string $obj)
     }
 }
 
+global proc mayaUsdMenu_editAsMaya(string $obj)
+{
+    if (!hasPrimUpdater())
+        return;
+
+    if (size($obj) != 0) {
+        mayaUsdEditAsMaya $obj;
+    }
+}
+
 global proc mayaUsdMenu_EditAsMayaDataOptionsCallback(string $optionsString)
 {
     optionVar -stringValue usdMaya_EditAsMayaDataOptions $optionsString;
@@ -35,10 +45,14 @@ global proc mayaUsdMenu_EditAsMayaDataOptionsReset(string $obj)
     mayaUsdMenu_EditAsMayaDataOptions($obj);
 }
 
-global proc mayaUsdMenu_ApplyEditAsMayaDataOptions(string $obj)
+global proc mayaUsdMenu_ApplyEditAsMayaDataOptions(string $obj, int $closeDialog)
 {
     mayaUsdTranslatorImport ("", "query", "", "mayaUsdMenu_EditAsMayaDataOptionsCallback");
 
+    if ($closeDialog) {
+        hideOptionBox;
+    }
+
     if (size($obj)) {
         waitCursor -state 1; 
         mayaUsdMenu_editAsMaya $obj; 
@@ -65,12 +79,12 @@ global proc mayaUsdMenu_EditAsMayaDataOptions(string $obj)
 
     string $applyCloseBtn = getOptionBoxApplyAndCloseBtn();
     button -edit -label `getMayaUsdString("kEditAsMayaData")`
-        -command ("mayaUsdMenu_ApplyEditAsMayaDataOptions(\"" + $obj + "\");")
+        -command ("mayaUsdMenu_ApplyEditAsMayaDataOptions(\"" + $obj + "\", 1);")
         $applyCloseBtn;
 
     string $applyBtn = getOptionBoxApplyBtn();
     button -edit
-        -command ("mayaUsdMenu_ApplyEditAsMayaDataOptions(\"\");")
+        -command ("mayaUsdMenu_ApplyEditAsMayaDataOptions(\"" + $obj + "\", 0);")
         $applyBtn;
 
     string $resetBtn = getOptionBoxResetBtn();