code review fixes

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -144,7 +144,7 @@ public static GameObject Convert (
                         fbxFullPath = IncrementFileName (fbxDirectoryFullPath, fbxFullPath);
                     }
                 }
-                var projectRelativePath = GetAssetRelativePath (fbxFullPath);
+                var projectRelativePath = EditorTools.ExportSettings.GetProjectRelativePath (fbxFullPath);
 
                 // Make sure that the object names in the hierarchy are unique.
                 // The import back in to Unity would do this automatically but
@@ -184,24 +184,14 @@ public static GameObject Convert (
                         prefabFullPath = IncrementFileName (prefabDirectoryFullPath, prefabFullPath);
                     }
                 }
-                var prefabProjectRelativePath = GetAssetRelativePath (prefabFullPath);
+                var prefabProjectRelativePath = EditorTools.ExportSettings.GetProjectRelativePath (prefabFullPath);
 
                 SetupFbxPrefab (toConvert, unityMainAsset, prefabProjectRelativePath, fbxFullPath);
 
                 toConvert.name = Path.GetFileNameWithoutExtension (fbxFullPath);
                 return toConvert;
             }
 
-            private static string GetAssetRelativePath(string fullPath){
-                var assetRelativePath = FbxExporters.EditorTools.ExportSettings.ConvertToAssetRelativePath(fullPath);
-                var projectRelativePath = "Assets/" + assetRelativePath;
-                if (string.IsNullOrEmpty(assetRelativePath)) {
-                    throw new System.Exception("Path " + fullPath + " must be in the Assets folder.");
-                }
-                return projectRelativePath;
-            }
-
-
             /// <summary>
             /// Create the prefab and connect it to the given fbx asset. 
             /// </summary>

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -15,18 +15,24 @@ public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow
             private GameObject[] m_toConvert;
             private string m_prefabFileName = "";
 
-            public static void Init (GameObject[] toConvert)
+            public static void Init (IEnumerable<GameObject> toConvert)
             {
                 ConvertToPrefabEditorWindow window = CreateWindow<ConvertToPrefabEditorWindow> ();
-                window.InitializeWindow (filename: toConvert.Length >= 1? toConvert[0].name : "", singleHierarchyExport: true, exportType: ModelExporter.AnimationExportType.all);
+                window.InitializeWindow (filename: "", singleHierarchyExport: true, exportType: ModelExporter.AnimationExportType.all);
                 window.SetGameObjectsToConvert (toConvert);
                 window.Show ();
             }
 
-            public void SetGameObjectsToConvert(GameObject[] toConvert){
-                m_toConvert = toConvert;
-                if (toConvert.Length >= 1) {
-                    m_prefabFileName = toConvert [0].name;
+            protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
+                var tempList = new List<GameObject> ();
+                foreach (var go in toConvert) {
+                    tempList.Add (go);
+                }
+                m_toConvert = tempList.ToArray ();
+
+                if (m_toConvert.Length >= 1) {
+                    m_prefabFileName = m_toConvert [0].name;
+                    this.SetFilename (m_prefabFileName);
                 }
             }
 

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -937,6 +937,15 @@ public static bool CanInstall()
             return instance.dccOptionPaths.Count > 0;
         }
 
+        public static string GetProjectRelativePath(string fullPath){
+            var assetRelativePath = FbxExporters.EditorTools.ExportSettings.ConvertToAssetRelativePath(fullPath);
+            var projectRelativePath = "Assets/" + assetRelativePath;
+            if (string.IsNullOrEmpty(assetRelativePath)) {
+                throw new System.Exception("Path " + fullPath + " must be in the Assets folder.");
+            }
+            return projectRelativePath;
+        }
+
         /// <summary>
         /// The relative save paths for given absolute paths.
         /// This is relative to the Application.dataPath ; it uses '/' as the