Merge pull request #416 from Unity-Technologies/UT-587-one-click-convert

Uni-46903 add checkbox to not show convert options on next convert

Author: inwoods

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs

@@ -5,7 +5,7 @@
 using UnityEngine.Formats.Fbx.Exporter;
 
 namespace UnityEditor.Formats.Fbx.Exporter
-{ 
+{
     public static class ConvertToModel
     {
         const string GameObjectMenuItemName = "GameObject/Convert To Linked Prefab Instance...";
@@ -83,8 +83,24 @@ public static GameObject[] CreateInstantiatedModelPrefab (
             GameObject [] unityGameObjectsToConvert)
         {
             var toExport = ModelExporter.RemoveRedundantObjects (unityGameObjectsToConvert);
-            ConvertToPrefabEditorWindow.Init (toExport);
-            return toExport.ToArray();
+
+            if (ExportSettings.instance.showConvertToPrefabDialog)
+            {
+                ConvertToPrefabEditorWindow.Init(toExport);
+                return toExport.ToArray();
+            }
+
+            var converted = new List<GameObject>();
+            var exportOptions = ExportSettings.instance.convertToPrefabSettings.info;
+            foreach (var go in toExport)
+            {
+                var convertedGO = Convert(go, exportOptions: exportOptions);
+                if(convertedGO != null)
+                {
+                    converted.Add(convertedGO);
+                }
+            }
+            return converted.ToArray();
         }
 
         /// <summary>

Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabEditorWindow.cs

@@ -266,5 +266,14 @@ protected override void CreateCustomUI()
             }
             GUILayout.EndHorizontal();
         }
+
+        protected override void DontShowDialogUI()
+        {
+            EditorGUI.indentLevel--;
+            ExportSettings.instance.showConvertToPrefabDialog = !EditorGUILayout.Toggle(
+                new GUIContent("Don't ask me again", "Don't ask me again, use the last used paths and options instead"),
+                !ExportSettings.instance.showConvertToPrefabDialog
+            );
+        }
     }
 }

Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs

@@ -239,6 +239,11 @@ protected bool TransferAnimationDestIsValid(Transform newValue){
             return true;
         }
 
+        /// <summary>
+        /// Add UI to turn the dialog off next time the user exports
+        /// </summary>
+        protected virtual void DontShowDialogUI() { }
+
         // -------------------------------------------------------------------------------------
 
         protected void OnGUI ()
@@ -351,6 +356,7 @@ protected void OnGUI ()
             GUILayout.FlexibleSpace ();
 
             GUILayout.BeginHorizontal ();
+            DontShowDialogUI();
             GUILayout.FlexibleSpace ();
             if (GUILayout.Button ("Cancel", GUILayout.Width(ExportButtonWidth))) {
                 this.Close ();

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs

@@ -37,6 +37,11 @@ public override void OnInspectorGUI() {
                     "Automatically updates prefabs with new fbx data that was imported."),
                 exportSettings.autoUpdaterEnabled
             );
+
+            exportSettings.showConvertToPrefabDialog = EditorGUILayout.Toggle(
+                new GUIContent("Show Convert UI:", "Enable Convert dialog when converting to a Linked Prefab"),
+                exportSettings.showConvertToPrefabDialog
+            );
             EditorGUILayout.Space();
             EditorGUILayout.Space();
             EditorGUI.indentLevel--;
@@ -366,6 +371,7 @@ public static string[] DCCVendorLocations
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;
         public bool BakeAnimation = true;
+        public bool showConvertToPrefabDialog = true;
 
         public string IntegrationSavePath;
 
@@ -419,6 +425,7 @@ public static string[] DCCVendorLocations
         protected override void LoadDefaults()
         {
             autoUpdaterEnabled = true;
+            showConvertToPrefabDialog = true;
             launchAfterInstallation = true;
             HideSendToUnityMenu = true;
             prefabSavePaths = new List<string>(){ kDefaultSavePath };