Merge pull request #348 from Unity-Technologies/UNI-41963-check-filename-not-empty

UNI-41963 give error if user tries to export without filename

Author: inwoods

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -82,24 +82,39 @@ 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");
 
                 var prefabDirPath = ExportSettings.GetPrefabAbsoluteSavePath ();
                 var prefabPath = System.IO.Path.Combine (prefabDirPath, m_prefabFileName + ".prefab");
 
+                // check if file already exists, give a warning if it does
+                if (!OverwriteExistingFile (fbxPath) || !OverwriteExistingFile (prefabPath)) {
+                    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;
+                        return false;
                     }
 
                     // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
@@ -113,19 +128,19 @@ protected override void Export ()
 
                         if (string.Equals(System.IO.Path.GetFullPath(fbxPath), System.IO.Path.GetFullPath(mainAssetAbsPath))) {
                             ConvertToModel.SetupFbxPrefab(go, mainAsset, relPrefabPath, mainAssetAbsPath);
-                            return;
+                            return true;
                         }
                     }
 
                     // check if file already exists, give a warning if it does
                     if (!OverwriteExistingFile (fbxPath)) {
-                        return;
+                        return false;
                     }
 
                     ConvertToModel.Convert (
                         go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
-                    return;
+                    return true;
                 }
 
                 foreach (var obj in ToExport) {
@@ -134,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

@@ -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 ();
 
@@ -509,12 +510,17 @@ protected override void OnEnable ()
                 }
             }
 
-            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) {
@@ -528,14 +534,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