Merge pull request #72 from Unity-Technologies/UNI-22861-remove-menu-items-from-Assets

UNI-22861 remove menu items from Assets menu

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -18,51 +18,30 @@ namespace Editor
     {
         public class ConvertToModel : System.IDisposable
         {
-            const string MenuItemName1 = "Assets/Convert To Prefab";
-            const string MenuItemName2 = "GameObject/Convert To Prefab";
+            const string MenuItemName1 = "GameObject/Convert To Prefab";
 
             /// <summary>
             /// Clean up this class on garbage collection
             /// </summary>
             public void Dispose () { }
 
-            /// <summary>
-            /// create menu item in the File menu
-            /// </summary>
-            [MenuItem (MenuItemName1, false)]
-            public static void OnMenuItem ()
-            {
-                GameObject [] unityGameObjectsToConvert = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
-                if (unityGameObjectsToConvert.Length <= 0) {
-                    ModelExporter.DisplayNoSelectionDialog ();
-                    return;
-                }
-
-                Object[] result = CreateInstantiatedModelPrefab (unityGameObjectsToConvert);
-                if (result.Length > 0) {
-                    Selection.objects = result;
-                }
-            }
-
-            /// <summary>
-            // Validate the menu item defined by the function above.
-            /// </summary>
-            [MenuItem (MenuItemName1, true)]
-            public static bool OnValidateMenuItem ()
-            {
-                return true;
-            }
-
             // Add a menu item called "Export Model..." to a GameObject's context menu.
             // OnContextItem gets called once per selected object 
             // (if the parent and child are selected, then OnContextItem will only be called on the parent)
-            [MenuItem (MenuItemName2, false, 30)]
+            [MenuItem (MenuItemName1, false, 30)]
             static void OnContextItem (MenuCommand command)
             {
                 if (command == null || command.context == null) {
                     // We were actually invoked from the top GameObject menu,
                     // not the context menu, so treat it as such.
-                    OnMenuItem();
+                    GameObject [] unityGameObjectsToConvert = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
+                    if (unityGameObjectsToConvert.Length <= 0) {
+                    ModelExporter.DisplayNoSelectionDialog ();
+                        return;
+                    }
+                    Object[] result = CreateInstantiatedModelPrefab (unityGameObjectsToConvert);
+                    if (result.Length>0)
+                        Selection.objects = result;
                     return;
                 }
 
@@ -71,10 +50,19 @@ static void OnContextItem (MenuCommand command)
                     Debug.LogError (string.Format("Error: {0} is not a GameObject and cannot be converted", command.context.name));
                     return;
                 }
-                GameObject[] result = CreateInstantiatedModelPrefab (new GameObject[]{selected});
-                if (result.Length>0)
-                    Selection.objects = result;
+                GameObject[] result1 = CreateInstantiatedModelPrefab (new GameObject[]{selected});
+                if (result1.Length>0)
+                    Selection.objects = result1;
+
+            }
 
+            /// <summary>
+            // Validate the menu item defined by the function above.
+            /// </summary>
+            [MenuItem (MenuItemName1, true, 30)]
+            public static bool OnValidateMenuItem ()
+            {
+                return true;
             }
 
             /// <summary>

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -32,7 +32,10 @@ public class ModelExporter : System.IDisposable
 
             const string ReadmeRelativePath = "FbxExporters/README.txt";
 
-            const string MenuItemName = "Assets/Export Model...";
+            // NOTE: The ellipsis at the end of the Menu Item name prevents the context
+            //       from being passed to command, thus resulting in OnContextItem()
+            //       being called only once regardless of what is selected.
+            const string MenuItemName = "GameObject/Export Model...";
 
             const string FileBaseName = "Untitled";
 
@@ -1107,10 +1110,11 @@ private void ReplaceFile ()
             }
 
             /// <summary>
-            /// create menu item in the File menu
+            /// Add a menu item to a GameObject's context menu.
             /// </summary>
-            [MenuItem (MenuItemName, false)]
-            public static void OnMenuItem ()
+            /// <param name="command">Command.</param>
+            [MenuItem (MenuItemName, false, 30)]
+            static void OnContextItem (MenuCommand command)
             {
                 if (Selection.objects.Length <= 0) {
                     DisplayNoSelectionDialog ();
@@ -1122,34 +1126,19 @@ public static void OnMenuItem ()
             /// <summary>
             // Validate the menu item defined by the function above.
             /// </summary>
-            [MenuItem (MenuItemName, true)]
+            [MenuItem (MenuItemName, true, 30)]
             public static bool OnValidateMenuItem ()
             {
                 return true;
             }
 
-            // Add a menu item called "Export Model..." to a GameObject's context menu.
-            // NOTE: The ellipsis at the end of the Menu Item name prevents the context
-            //       from being passed to command, thus resulting in OnContextItem()
-            //       being called only once regardless of what is selected.
-            [MenuItem ("GameObject/Export Model...", false, 30)]
-            static void OnContextItem (MenuCommand command)
-            {
-                if (Selection.objects.Length <= 0) {
-                    DisplayNoSelectionDialog ();
-                    return;
-                }
-                OnExport ();
-            }
-
             public static void DisplayNoSelectionDialog()
             {
                 UnityEditor.EditorUtility.DisplayDialog (
                     "Fbx Exporter Warning", 
                     "No GameObjects selected for export.", 
                     "Ok");
             }
-
             //
             // export mesh info from Unity
             //