Merge pull request #200 from Unity-Technologies/Uni-26023_Pull_out_browse_button_from_the_dropdown

Uni-26023 moved the browse button out of the dropdown menu

Author: AustinJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -27,7 +27,7 @@ public override void OnInspectorGUI() {
                 GUILayout.Label ("Version: " + version, EditorStyles.centeredGreyMiniLabel);
                 EditorGUILayout.Space ();
             }
-
+            GUILayout.BeginVertical();
             exportSettings.mayaCompatibleNames = EditorGUILayout.Toggle (
                 new GUIContent ("Convert to Maya Compatible Naming:",
                     "In Maya some symbols such as spaces and accents get replaced when importing an FBX " +
@@ -49,7 +49,6 @@ public override void OnInspectorGUI() {
             GUILayout.Label (new GUIContent (
                 "Export Path:",
                 "Relative path for saving Model Prefabs."));
-
             var pathLabel = ExportSettings.GetRelativeSavePath();
             if (pathLabel == ".") { pathLabel = "(Assets root)"; }
             EditorGUILayout.SelectableLabel(pathLabel,
@@ -93,17 +92,12 @@ public override void OnInspectorGUI() {
             GUILayout.Label (new GUIContent (
                 "3D Application:",
                 "Select the 3D Application for which you would like to install the Unity integration."));
-
+            
             // dropdown to select Maya version to use
             var options = ExportSettings.GetDCCOptions();
-            // make sure we never initially have browse selected
-            if (exportSettings.selectedDCCApp == options.Length - 1) {
-                exportSettings.selectedDCCApp = exportSettings.GetPreferredDCCApp();
-            }
 
-            int oldValue = exportSettings.selectedDCCApp;
             exportSettings.selectedDCCApp = EditorGUILayout.Popup(exportSettings.selectedDCCApp, options);
-            if (exportSettings.selectedDCCApp == options.Length - 1) {
+            if (GUILayout.Button("Browse", EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth))) {
                 var ext = "";
                 switch (Application.platform) {
                 case RuntimePlatform.WindowsEditor:
@@ -129,7 +123,6 @@ public override void OnInspectorGUI() {
                     // Therefore check both executable folder (for Mac) and its parent (for Windows)
                     if (md.Name.ToLower().StartsWith("mayalt") || md.Parent.Name.ToLower ().StartsWith ("mayalt")) {
                         Debug.LogError (string.Format("Unity Integration does not support Maya LT: \"{0}\"", md.FullName));
-                        exportSettings.selectedDCCApp = oldValue;
                         return;
                     }
 
@@ -143,14 +136,11 @@ public override void OnInspectorGUI() {
                     }
                     if (foundDCCPath == null) {
                         Debug.LogError (string.Format ("Could not find supported 3D application at: \"{0}\"", Path.GetDirectoryName (dccPath)));
-                        exportSettings.selectedDCCApp = oldValue;
                     } else {
                         dccPath = foundDCCPath;
                         ExportSettings.AddDCCOption (dccPath, foundDCC);
                     }
                     Repaint ();
-                } else {
-                    exportSettings.selectedDCCApp = oldValue;
                 }
             }
             GUILayout.EndHorizontal ();
@@ -164,6 +154,7 @@ public override void OnInspectorGUI() {
 
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
+            GUILayout.EndVertical();
 
             if (GUI.changed) {
                 EditorUtility.SetDirty (exportSettings);
@@ -550,19 +541,17 @@ public static GUIContent[] GetDCCOptions(){
 
             if (instance.dccOptionPaths.Count <= 0) {
                 return new GUIContent[]{
-                    new GUIContent("<No 3D Application found>"),
-                    new GUIContent("Browse...")
+                    new GUIContent("<No 3D Application found>")
                 };
             }
 
-            GUIContent[] optionArray = new GUIContent[instance.dccOptionPaths.Count+1];
+            GUIContent[] optionArray = new GUIContent[instance.dccOptionPaths.Count];
             for(int i = 0; i < instance.dccOptionPaths.Count; i++){
                 optionArray [i] = new GUIContent(
                     instance.dccOptionNames[i],
                     instance.dccOptionPaths[i]
                 );
             }
-            optionArray [optionArray.Length - 1] = new GUIContent("Browse...");
 
             return optionArray;
         }