Merge branch 'master' into UNI-41969-restore-include-setting

Author: inwoods

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -108,18 +108,7 @@ public static GameObject Convert (
             )
             {
                 // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
-                // Children of model prefab instances will also have "model prefab instance"
-                // as their prefab type, so it is important that it is the root that is selected.
-                //
-                // e.g. If I have the following hierarchy: 
-                //      Cube
-                //      -- Sphere
-                //
-                // Both the Cube and Sphere will have ModelPrefabInstance as their prefab type.
-                // However, when selecting the Sphere to convert, we don't want to connect it to the
-                // existing FBX but create a new FBX containing just the sphere.
-                PrefabType unityPrefabType = PrefabUtility.GetPrefabType(toConvert);
-                if (unityPrefabType == PrefabType.ModelPrefabInstance && toConvert.Equals(PrefabUtility.FindPrefabRoot(toConvert))) {
+                if(IsModelInstance(toConvert)){
                     // don't re-export fbx
                     // create prefab out of model instance in scene, link to existing fbx
                     var mainAsset = PrefabUtility.GetPrefabParent(toConvert) as GameObject;
@@ -223,6 +212,26 @@ public static void SetupFbxPrefab(GameObject toConvert, GameObject unityMainAsse
                 }
             }
 
+            /// <summary>
+            /// Determines if the given GameObject is a model instance.
+            /// </summary>
+            /// <returns><c>true</c> if go is a model instance; otherwise, <c>false</c>.</returns>
+            /// <param name="go">Go.</param>
+            public static bool IsModelInstance(GameObject go){
+                // Children of model prefab instances will also have "model prefab instance"
+                // as their prefab type, so it is important that it is the root that is selected.
+                //
+                // e.g. If I have the following hierarchy: 
+                //      Cube
+                //      -- Sphere
+                //
+                // Both the Cube and Sphere will have ModelPrefabInstance as their prefab type.
+                // However, when selecting the Sphere to convert, we don't want to connect it to the
+                // existing FBX but create a new FBX containing just the sphere.
+                PrefabType unityPrefabType = PrefabUtility.GetPrefabType(go);
+                return unityPrefabType == PrefabType.ModelPrefabInstance && go.Equals (PrefabUtility.FindPrefabRoot (go));
+            }
+
             /// <summary>
             /// Check if the file exists, and if it does, then increment the name.
             /// e.g. if filename is Sphere.fbx and it already exists, change it to Sphere 1.fbx.

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -45,12 +45,23 @@ protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
 
                 TransferAnimationSource = null;
                 TransferAnimationDest = null;
-
                 if (ToExport.Length == 1) {
-                    m_prefabFileName = ToExport [0].name;
+                    var go = ModelExporter.GetGameObject (ToExport [0]);
+                    // check if the GameObject is a model instance, use as default filename and path if it is
+                    if(ConvertToModel.IsModelInstance(go)) {
+                        var mainAsset = PrefabUtility.GetPrefabParent (go) as GameObject;
+                        var mainAssetRelPath = AssetDatabase.GetAssetPath (mainAsset);
+                        // remove Assets/ from beginning of path
+                        mainAssetRelPath = mainAssetRelPath.Substring ("Assets".Length);
+
+                        m_prefabFileName = System.IO.Path.GetFileNameWithoutExtension (mainAssetRelPath);
+                        ExportSettings.AddFbxSavePath (System.IO.Path.GetDirectoryName (mainAssetRelPath));
+                    }
+                    else{
+                        m_prefabFileName = ToExport [0].name;
+                    }
 
                     // if only one object selected, set transfer source/dest to this object
-                    var go = ModelExporter.GetGameObject (ToExport [0]);
                     if (go) {
                         TransferAnimationSource = go.transform;
                         TransferAnimationDest = go.transform;
@@ -71,8 +82,18 @@ protected override void OnEnable ()
                 m_prefabExtLabelWidth = m_fbxExtLabelStyle.CalcSize (new GUIContent (".prefab")).x;
             }
 
-            protected override void Export ()
+            protected override bool Export ()
             {
+                if (string.IsNullOrEmpty (m_exportFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify an fbx filename");
+                    return false;
+                }
+
+                if (string.IsNullOrEmpty (m_prefabFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify a prefab filename");
+                    return false;
+                }
+
                 var fbxDirPath = ExportSettings.GetFbxAbsoluteSavePath ();
                 var fbxPath = System.IO.Path.Combine (fbxDirPath, m_exportFileName + ".fbx");
 
@@ -81,20 +102,45 @@ protected override void Export ()
 
                 // check if file already exists, give a warning if it does
                 if (!OverwriteExistingFile (fbxPath) || !OverwriteExistingFile (prefabPath)) {
-                    return;
+                    return false;
                 }
 
                 if (ToExport == null) {
                     Debug.LogError ("FbxExporter: missing object for conversion");
-                    return;
+                    return false;
                 }
 
                 if (ToExport.Length == 1) {
                     var go = ModelExporter.GetGameObject (ToExport [0]);
+
+                    if (!OverwriteExistingFile (prefabPath)) {
+                        return false;
+                    }
+
+                    // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
+                    if(ConvertToModel.IsModelInstance(go)) {
+                        // don't re-export fbx
+                        // create prefab out of model instance in scene, link to existing fbx
+                        var mainAsset = PrefabUtility.GetPrefabParent(go) as GameObject;
+                        var mainAssetRelPath = AssetDatabase.GetAssetPath(mainAsset);
+                        var mainAssetAbsPath = System.IO.Directory.GetParent(Application.dataPath) + "/" + mainAssetRelPath;
+                        var relPrefabPath = ExportSettings.GetProjectRelativePath (prefabPath);
+
+                        if (string.Equals(System.IO.Path.GetFullPath(fbxPath), System.IO.Path.GetFullPath(mainAssetAbsPath))) {
+                            ConvertToModel.SetupFbxPrefab(go, mainAsset, relPrefabPath, mainAssetAbsPath);
+                            return true;
+                        }
+                    }
+
+                    // check if file already exists, give a warning if it does
+                    if (!OverwriteExistingFile (fbxPath)) {
+                        return false;
+                    }
+
                     ConvertToModel.Convert (
                         go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
-                    return;
+                    return true;
                 }
 
                 foreach (var obj in ToExport) {
@@ -103,6 +149,7 @@ protected override void Export ()
                         go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
                 }
+                return true;
             }
 
             protected override ExportOptionsSettingsSerializeBase SettingsObject

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -116,7 +116,7 @@ public void OnPresetSelectionChanged()
                 this.Repaint ();
             }
 
-            protected abstract void Export ();
+            protected abstract bool Export ();
 
             /// <summary>
             /// Function to be used by derived classes to add custom UI between the file path selector and export options.
@@ -356,8 +356,9 @@ protected void OnGUI ()
                 }
 
                 if (GUILayout.Button (ExportButtonName, GUILayout.Width(ExportButtonWidth))) {
-                    Export ();
-                    this.Close ();
+                    if (Export ()) {
+                        this.Close ();
+                    }
                 }
                 GUILayout.EndHorizontal ();
 
@@ -528,12 +529,17 @@ protected virtual void RestoreSettings()
                 }
             }
 
-            protected override void Export(){
+
+            protected override bool Export(){
+                if (string.IsNullOrEmpty (m_exportFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify an fbx filename");
+                    return false;
+
                 var folderPath = ExportSettings.GetFbxAbsoluteSavePath ();
                 var filePath = System.IO.Path.Combine (folderPath, m_exportFileName + ".fbx");
 
                 if (!OverwriteExistingFile (filePath)) {
-                    return;
+                    return false;
                 }
 
                 if (IsPlayableDirector) {
@@ -547,14 +553,15 @@ protected override void Export(){
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();
-                    return;
+                    return true;
                 }
 
                 if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject, timelineAnim: m_isTimelineAnim) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();
                 }
+                return true;
             }
 
             #if UNITY_2018_1_OR_NEWER  

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -82,14 +82,8 @@ public class ModelExporter : System.IDisposable
             //       from being passed to command, thus resulting in OnContextItem()
             //       being called only once regardless of what is selected.
             const string MenuItemName = "GameObject/Export To FBX...";
-            const string ModelOnlyMenuItemName = "GameObject/Export Model Only...";
 
-            const string ClipMenuItemName = "GameObject/Export All Recorded Animation Clips...";
-            const string TimelineClipMenuItemName = "GameObject/Export Selected Timeline Clip...";																				
-
-            const string AnimOnlyMenuItemName = "GameObject/Export Animation Only...";
-
-            const string FileBaseName = "Untitled";
+            const string TimelineClipMenuItemName = "GameObject/Export Selected Timeline Clip...";
 
             const string ProgressBarTitle = "Fbx Export";
 
@@ -3401,40 +3395,6 @@ public static bool OnValidateMenuItem ()
                 return true;
             }
 
-            /// <summary>
-            /// Validate the menu item defined by the function ModelOnlyOnContextItem.
-            /// </summary>
-            [MenuItem (ModelOnlyMenuItemName, true, 30)]
-            public static bool ModelOnlyOnValidateMenuItem ()
-            {
-                return true;
-            }
-
-            /// <summary>
-            // Validate the menu item defined by the function above.
-            /// </summary>
-            [MenuItem (AnimOnlyMenuItemName, true, 30)]
-            public static bool OnValidateAnimOnlyMenuItem ()
-            {
-                Object[] selection = Selection.objects;
-
-                if (selection == null || selection.Length == 0)
-                {
-                    return false;
-                }
-
-                foreach (Object obj in selection)
-                {
-                    GameObject gameObj = obj as GameObject;
-                    if (gameObj != null && (gameObj.GetComponent<Animation>() != null || gameObj.GetComponent<Animator>() != null))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
             public static void DisplayNoSelectionDialog()
             {
                 UnityEditor.EditorUtility.DisplayDialog (
@@ -3885,18 +3845,7 @@ private static string MakeFileName (string basename = "test", string extension =
             {
                 return basename + "." + extension;
             }
-
-
-            private static string GetExportFilePath(string filenameSuggestion = ""){
-                var directory = string.IsNullOrEmpty (LastFilePath)
-                    ? Application.dataPath
-                    : System.IO.Path.GetDirectoryName (LastFilePath);
-
-                var title = string.Format ("Export To FBX ({0})", FileBaseName);
-
-                return EditorUtility.SaveFilePanel (title, directory, filenameSuggestion, kFBXFileExtension);
-            }
-
+                
             private static void OnExport ()
             {
                 GameObject [] selectedGOs = Selection.GetFiltered<GameObject> (SelectionMode.TopLevel);