Rename ConvertToBlahBlahBlah with just one object to simply 'Convert'.

This is for Karl's probuilder benefit -- he's using reflection, and was picking
up the wrong override.

Also mucked a bit with the control flow of the version with arrays, which had
subtly different handling depending on which menu we were coming from. Now we
get the same call to the underlying API either way.

Author: Benoit Hudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -26,29 +26,29 @@ public static class ConvertToModel
             [MenuItem (MenuItemName1, false, 30)]
             static void OnContextItem (MenuCommand command)
             {
+                GameObject [] selection = null;
+
                 if (command == null || command.context == null) {
-                    // We were actually invoked from the top GameObject menu,
-                    // not the context menu, so treat it as such.
-                    GameObject [] unityGameObjectsToConvert = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
-                    if (unityGameObjectsToConvert.Length <= 0) {
-                    ModelExporter.DisplayNoSelectionDialog ();
-                        return;
+                    // We were actually invoked from the top GameObject menu, so use the selection.
+                    selection = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
+                } else {
+                    // We were invoked from the right-click menu, so use the context of the context menu.
+                    var selected = command.context as GameObject;
+                    if (selected) {
+                        selection = new GameObject[] { selected };
                     }
-                    Object[] result = CreateInstantiatedModelPrefab (unityGameObjectsToConvert);
-                    if (result.Length>0)
-                        Selection.objects = result;
-                    return;
                 }
 
-                GameObject selected = command.context as GameObject;
-                if (selected == null) {
-                    Debug.LogError (string.Format("Error: {0} is not a GameObject and cannot be converted", command.context.name));
+                if (selection == null || selection.Length == 0) {
+                    ModelExporter.DisplayNoSelectionDialog ();
                     return;
                 }
-                GameObject[] result1 = CreateInstantiatedModelPrefab (new GameObject[]{selected});
-                if (result1.Length>0)
-                    Selection.objects = result1;
 
+                try {
+                    Selection.objects = CreateInstantiatedModelPrefab (selection);
+                } catch (System.Exception xcp) {
+                    Debug.LogException (xcp);
+                }
             }
 
             /// <summary>
@@ -83,7 +83,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                 var wasExported = new List<GameObject>();
                 foreach(var go in toExport) {
                     try {
-                        wasExported.Add(CreateInstantiatedModelPrefab(go,
+                        wasExported.Add(Convert(go,
                             directoryFullPath: directoryFullPath,
                             keepOriginal: keepOriginal));
                     } catch(System.Exception xcp) {
@@ -112,7 +112,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
             /// fbxFullPath is specified. May be null, in which case we use the
             /// export settings.</param>
             /// <param name="keepOriginal">If set to <c>true</c>, keep the original in the scene.</param>
-            public static GameObject CreateInstantiatedModelPrefab (
+            public static GameObject Convert (
                 GameObject toConvert,
                 string directoryFullPath = null,
                 string fbxFullPath = null,

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -133,7 +133,7 @@ public void BasicTest()
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
 
             // Convert it to a prefab.
-            var cubePrefabInstance = ConvertToModel.CreateInstantiatedModelPrefab(cube,
+            var cubePrefabInstance = ConvertToModel.Convert(cube,
                 directoryFullPath: path, keepOriginal: true);
 
             // Make sure it's what we expect.

Assets/FbxExporters/Editor/UnitTests/FbxPrefabTest.cs

@@ -351,7 +351,7 @@ public void TestCubeAtRoot()
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
             cube.name = "Cube";
             var cubeAssetPath = GetRandomFbxFilePath();
-            var autoPrefab = FbxExporters.Editor.ConvertToModel.CreateInstantiatedModelPrefab(cube,
+            var autoPrefab = FbxExporters.Editor.ConvertToModel.Convert(cube,
                 fbxFullPath: cubeAssetPath);
             Assert.IsTrue(autoPrefab);