Merge pull request #214 from Unity-Technologies/UNI-31096-sprint34-release

Uni 31096 sprint34 release bug fixes

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -255,6 +255,12 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         public const string kMayaLtOptionName = "MayaLT ";
         public const string kBlenderOptionName = "Blender ";
 
+        private static string DefaultIntegrationSavePath {
+            get{
+                return Path.GetDirectoryName(Application.dataPath);
+            }
+        }
+
         /// <summary>
         /// The paths where all the different versions of Maya are installed
         /// by default. Depends on the platform.
@@ -328,7 +334,7 @@ protected override void LoadDefaults()
             launchAfterInstallation = true;
             ExportFormatSelection = 0;
             convertToModelSavePath = kDefaultSavePath;
-            IntegrationSavePath = Directory.GetCurrentDirectory().ToString();
+            IntegrationSavePath = DefaultIntegrationSavePath;
             dccOptionPaths = null;
             dccOptionNames = null;
         }
@@ -760,7 +766,7 @@ public static string GetIntegrationSavePath()
             if (string.IsNullOrEmpty(instance.IntegrationSavePath.Trim()) || !Directory.Exists(instance.IntegrationSavePath))
             {
                 //The project folder, above the asset folder
-                Directory.GetCurrentDirectory().ToString();
+                instance.IntegrationSavePath = DefaultIntegrationSavePath;
             }
             return instance.IntegrationSavePath;
         }

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

@@ -11,26 +11,55 @@ global string $unityFamilyLabel = "The UnityFbxForMaya plugin allows you to reli
 global string $unityImportLabel = "Import FBX file from Unity Project and auto-configure for exporting";
 global string $unityExportLabel = "Export Model to Unity";
 
+global string $unityCommandsFile = "unityCommands.mel";
+global string $unityImportMenuName = "Import";
+global string $unityExportMenuName = "Export";
+global string $unityImportCommand = "unityImport";
+global string $unityExportCommand = "unityExport";
 
 global proc string unityWhatsNewVersion(){
     return `about -q -version`;
 
 }
 
 global proc unitySetupUI(){
-
     $isHeadless = `optionVar -q "UnityFbxForMaya_Headless"`;
     if($isHeadless){
         // headless install, don't add UI
         return;
     }
+    
+    evalDeferred -lowestPriority "unityInstallUI";
+}
+
+global proc unityInstallUI(){
+    global string $unityMenuName;
+    global string $unityMenuDivider;
+    global string $unityMenuLabel;
+    global string $unityMenuInsertAfter;
+
+    global string $unityImportIconPath;
+    global string $unityExportIconPath;
+    global string $unityIconPath;
+
+    global string $unityFamilyLabel;
+    global string $unityImportLabel;
+    global string $unityExportLabel;
+
+    global string $unityCommandsFile;
+    global string $unityImportMenuName;
+    global string $unityExportMenuName;
+    global string $unityImportCommand;
+    global string $unityExportCommand;
+    
+    global string $gMainFileMenu;
 
-    evalDeferred -lowestPriority "buildFileMenu; \
-    $parentMenu = $gMainFileMenu; \
-    $pluginVersion = unityWhatsNewVersion(); \
-    source \"unityCommands.mel\"; \
-    menuItem -parent $parentMenu -insertAfter $unityMenuInsertAfter -divider true -longDivider false -version $pluginVersion $unityMenuDivider; \
-    menuItem -parent $parentMenu -insertAfter $unityMenuDivider -subMenu true -label $unityMenuLabel -tearOff true -version $pluginVersion -image $unityIconPath -annotation $unityFamilyLabel $unityMenuName; \
-    menuItem -parent $unityMenuName -label \"Import\" -version $pluginVersion -image $unityImportIconPath -annotation $unityImportLabel -command \"unityImport\"; \
-    menuItem -parent $unityMenuName -label \"Export\" -version $pluginVersion -image $unityExportIconPath -annotation $unityExportLabel -command \"unityExport\";";
+    buildFileMenu;
+    $parentMenu = $gMainFileMenu;
+    $pluginVersion = unityWhatsNewVersion();
+    eval ("source " + $unityCommandsFile);
+    menuItem -parent $parentMenu -insertAfter $unityMenuInsertAfter -divider true -longDivider false -version $pluginVersion $unityMenuDivider;
+    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;
 }

RELEASE_NOTES.md

@@ -4,6 +4,8 @@ RELEASE NOTES
 
 NEW FEATURES
 
+* Ship all C# scripts as source code
+
 * Added Maya LT Integration
 
 Replaced Maya python implementation with MEL script, which is used by both Maya and Maya LT.