Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-31096-sprint34-release

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -104,6 +104,38 @@ public override void OnInspectorGUI() {
             }
             GUILayout.EndHorizontal ();
 
+            GUILayout.BeginHorizontal ();
+            GUILayout.Label (new GUIContent (
+                "Integrations Path:",
+                "Installation path for 3D application integrations."), GUILayout.Width(LabelWidth - 3));
+
+            var IntegrationsPathLabel = ExportSettings.GetIntegrationSavePath();
+            EditorGUILayout.SelectableLabel(IntegrationsPathLabel,
+                EditorStyles.textField,
+                GUILayout.MinWidth(SelectableLabelMinWidth),
+                GUILayout.Height(EditorGUIUtility.singleLineHeight));
+
+            if (GUILayout.Button(new GUIContent("...", "Browse to a new installation path for 3D application integrations"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
+            {
+                string initialPath = ExportSettings.GetIntegrationSavePath();
+
+                string fullPath = EditorUtility.OpenFolderPanel(
+                        "Select Integrations Path", initialPath, null
+                        );
+
+                if (!string.IsNullOrEmpty(fullPath))
+                {
+                    ExportSettings.SetIntegrationSavePath(fullPath);
+
+                    // Make sure focus is removed from the selectable label
+                    // otherwise it won't update
+                    GUIUtility.hotControl = 0;
+                    GUIUtility.keyboardControl = 0;                    
+                }
+            }
+
+            GUILayout.EndHorizontal();
+
             EditorGUILayout.Space ();
 
             GUILayout.BeginHorizontal ();
@@ -272,6 +304,8 @@ public static string[] DCCVendorLocations {
         public bool launchAfterInstallation;
         public int ExportFormatSelection;
 
+        public string IntegrationSavePath;
+
         public int selectedDCCApp = 0;
 
         /// <summary>
@@ -301,6 +335,7 @@ protected override void LoadDefaults()
             launchAfterInstallation = true;
             ExportFormatSelection = 0;
             convertToModelSavePath = kDefaultSavePath;
+            IntegrationSavePath = Directory.GetCurrentDirectory().ToString();
             dccOptionPaths = null;
             dccOptionNames = null;
         }
@@ -726,6 +761,22 @@ public static void SetRelativeSavePath(string newPath) {
             instance.convertToModelSavePath = NormalizePath(newPath, isRelative: true);
         }
 
+        public static string GetIntegrationSavePath()
+        {
+            //If the save path gets messed up and ends up not being valid, just use the project folder as the default
+            if (string.IsNullOrEmpty(instance.IntegrationSavePath.Trim()) || !Directory.Exists(instance.IntegrationSavePath))
+            {
+                //The project folder, above the asset folder
+                Directory.GetCurrentDirectory().ToString();
+            }
+            return instance.IntegrationSavePath;
+        }
+
+        public static void SetIntegrationSavePath(string newPath)
+        {
+            instance.IntegrationSavePath = newPath;
+        }
+
         /// <summary>
         /// Convert an absolute path into a relative path like what you would
         /// get from GetRelativeSavePath.

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -714,15 +714,6 @@ private static void ShowSuccessDialog(string dcc, int exitCode){
             UnityEditor.EditorUtility.DisplayDialog (title, message, "Ok");
         }
 
-        private static string DefaultIntegrationSavePath
-        {
-            get{
-                return Application.dataPath;
-            }
-        }
-
-        private static string LastIntegrationSavePath = DefaultIntegrationSavePath;
-
         public static void InstallDCCIntegration ()
         {
             var dccExe = GetDCCExe ();
@@ -759,18 +750,14 @@ private static bool GetIntegrationFolder(DCCIntegration dcc){
             if (System.IO.File.Exists (zipPath)) {
                 return DecompressIntegrationZipFile (zipPath, dcc);
             }
-            dcc.SetIntegrationFolderPath (DefaultIntegrationSavePath);
+            dcc.SetIntegrationFolderPath (EditorTools.ExportSettings.GetIntegrationSavePath());
             return true;
         }
 
         private static bool DecompressIntegrationZipFile(string zipPath, DCCIntegration dcc)
         {
-            // prompt user to enter location to unzip file
-            var unzipFolder = EditorUtility.OpenFolderPanel(string.Format("Select Location to Save {0} Integration", dcc.DccDisplayName),LastIntegrationSavePath,"");
-            if (string.IsNullOrEmpty (unzipFolder)) {
-                // user has cancelled, do nothing
-                return false;
-            }
+            string unzipFolder;
+            unzipFolder = EditorTools.ExportSettings.GetIntegrationSavePath();
 
             // check that this is a valid location to unzip the file
             if (!DirectoryHasWritePermission (unzipFolder)) {
@@ -788,8 +775,6 @@ private static bool DecompressIntegrationZipFile(string zipPath, DCCIntegration
                 }
             }
 
-            LastIntegrationSavePath = unzipFolder;
-
             // if file already unzipped in this location, then prompt user
             // if they would like to continue unzipping or use what is there
             if (dcc.FolderAlreadyUnzippedAtPath (unzipFolder)) {