remove EnforceUniqueNames from ConvertToModel

- already creating unique names in the FbxExporter
- Make convert take ConvertToPrefabSettingsSerialize instead of ExportOptions to avoid being able to use the regular export options for linked prefabs

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -104,7 +104,7 @@ public static GameObject Convert (
                 string fbxFullPath = null,
                 string prefabDirectoryFullPath = null,
                 string prefabFullPath = null, 
-                EditorTools.IExportOptions exportOptions = null
+                EditorTools.ConvertToPrefabSettingsSerialize exportOptions = null
             )
             {
                 // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
@@ -135,12 +135,6 @@ public static GameObject Convert (
                 }
                 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
-                // we prefer to control it so that the Maya artist can see the
-                // same names as exist in Unity.
-                EnforceUniqueNames (new GameObject[] {toConvert});
-
                 // Export to FBX. It refreshes the database.
                 {
                     var fbxActualPath = ModelExporter.ExportObject (
@@ -274,35 +268,6 @@ public static string IncrementFileName(string path, string filename)
                 return file;
             }
 
-            /// <summary>
-            /// Enforces that all object names be unique before exporting.
-            /// If an object with a duplicate name is found, then it is incremented.
-            /// e.g. Sphere becomes Sphere 1
-            /// </summary>
-            /// <param name="exportSet">Export set.</param>
-            public static void EnforceUniqueNames(IEnumerable<GameObject> exportSet)
-            {
-                Dictionary<string, int> NameToIndexMap = new Dictionary<string, int> ();
-                string format = "{0} {1}";
-
-                Queue<GameObject> queue = new Queue<GameObject> (exportSet);
-
-                while(queue.Count > 0){
-                    var go = queue.Dequeue ();
-                    var name = go.name;
-                    if (NameToIndexMap.ContainsKey (name)) {
-                        go.name = string.Format (format, name, NameToIndexMap [name]);
-                        NameToIndexMap [name]++;
-                    } else {
-                        NameToIndexMap [name] = 1;
-                    }
-
-                    foreach (Transform child in go.transform) {
-                        queue.Enqueue (child.gameObject);
-                    }
-                }
-            }
-
             /// <summary>
             /// Updates the meshes and materials of the exported GameObjects
             /// to link to those imported from the FBX.

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -45,19 +45,6 @@ public void TestStaticHelpers()
                 Assert.AreEqual (filename2, ConvertToModel.IncrementFileName (tempPath, filename1));
             }
 
-            // Test EnforceUniqueNames
-            {
-                var a = new GameObject("a");
-                var b = new GameObject("b");
-                var a1 = new GameObject("a");
-                var a2 = new GameObject("a");
-                ConvertToModel.EnforceUniqueNames(new GameObject[] { a, b, a1, a2 });
-                Assert.AreEqual("a", a.name);
-                Assert.AreEqual("b", b.name);
-                Assert.AreEqual("a 1", a1.name);
-                Assert.AreEqual("a 2", a2.name);
-            }
-
             // Test CopyComponents
             {
                 var a = GameObject.CreatePrimitive (PrimitiveType.Cube);