Merge pull request #232 from Unity-Technologies/Uni-31929_SendToUnity_is_unhidden

Uni 31929 send to unity is unhidden after importing

Author: AustinJubrey

Assets/Integrations/Autodesk/maya/scripts/unityCommands.mel

@@ -2,6 +2,14 @@ global string $UnityExportSet = "UnityFbxExportSet";
 global string $UnityFbxFilePathAttr = "unityFbxFilePath";
 global string $UnityFbxFileNameAttr = "unityFbxFileName";
 
+global proc unityRemoveNativeMenuOnLoad(){
+    $removeSendToUnityMenu = `optionVar -q "UnityFbxForMaya_removeSendToUnityMenu"`;
+    if($removeSendToUnityMenu && `menu -exists "sendToUnityMenu"`){
+        //Remove the GamePipeline 'SendToUnity' button
+        menu -e -visible false "sendToUnityMenu";
+    }
+}
+
 // Load a specified settings file
 proc int loadUnityFbxSettings(string $fileName, string $settingType){
     // check if the file exists
@@ -49,7 +57,6 @@ proc int setExists(string $setName){
     return stringArrayContains($setName, `listSets -allSets`);
 }
 
-
 proc int loadUnityPlugin(string $plugin){
     if (`pluginInfo -q -loaded $plugin` == false){
         loadPlugin $plugin;
@@ -61,7 +68,7 @@ proc int loadUnityPlugin(string $plugin){
 };
 
 
-proc int loadUnityDependencies(){
+global proc int loadUnityDependencies(){
     // GamePipeline plugin 'SendToUnitySelection' command used in export
     $pluginsToLoad = {"GamePipeline", "fbxmaya"};
 
@@ -77,11 +84,7 @@ proc int loadUnityDependencies(){
         $result = $result && `loadUnityPlugin ($plugin + "." + $ext)`;
     }
 
-    $removeSendToUnityMenu = `optionVar -q "UnityFbxForMaya_removeSendToUnityMenu"`;
-    if($removeSendToUnityMenu && `menu -exists "sendToUnityMenu"`){
-        //Remove the GamePipeline 'SendToUnity' button
-        menu -e -visible false "sendToUnityMenu";
-    }
+    unityRemoveNativeMenuOnLoad();
 
     return $result;
 }

Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel

@@ -16,21 +16,22 @@ global string $unityImportMenuName = "Import";
 global string $unityExportMenuName = "Export";
 global string $unityImportCommand = "unityImport";
 global string $unityExportCommand = "unityExport";
-global string $unityRemoveSendToUnityMenuOption = "UnityFbxForMaya_removeSendToUnityMenu";
-global string $unitySendToUnityMenuName = "sendToUnityMenu";
 
 global proc string unityWhatsNewVersion(){
     return `about -q -version`;
 
 }
 
 global proc unitySetupUI(){
-
+    global string $unityCommandsFile;
     $isHeadless = `optionVar -q "UnityFbxForMaya_Headless"`;
     if($isHeadless){
         // headless install, don't add UI
         return;
     }    
+    
+    eval ("source " + $unityCommandsFile);
+    loadUnityDependencies();
 
     evalDeferred -lowestPriority "unityInstallUI";
 }
@@ -55,9 +56,6 @@ global proc unityInstallUI(){
     global string $unityImportCommand;
     global string $unityExportCommand;
 
-    global string $unityRemoveSendToUnityMenuOption;
-    global string $unitySendToUnityMenuName;
-    
     global string $gMainFileMenu;
 
     buildFileMenu;
@@ -68,10 +66,7 @@ global proc unityInstallUI(){
     menuItem -parent $parentMenu -insertAfter $unityMenuDivider -subMenu true -label $unityMenuLabel -tearOff true -version $pluginVersion -image $unityIconPath -annotation $unityFamilyLabel $unityMenuName;
     menuItem -parent $unityMenuName -label $unityImportMenuName -version $pluginVersion -image $unityImportIconPath -annotation $unityImportLabel -command $unityImportCommand;
     menuItem -parent $unityMenuName -label $unityExportMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportLabel -command $unityExportCommand;
-    
-    $unityRemoveSendToUnityMenuOption = `optionVar -q $unityRemoveSendToUnityMenuOption`;
-    if($unityRemoveSendToUnityMenuOption && `menu -exists $unitySendToUnityMenuName`){
-        menu -e -visible false $unitySendToUnityMenuName;
-    }    
+
+    unityRemoveNativeMenuOnLoad(); 
 
 }