Merge pull request #382 from Unity-Technologies/bugfix/fixing-new-shape-menu-entry

Re-adding menu entry for the new shape tool

Author: lopezt-unity

Editor/EditorCore/EditorToolbarMenuItems.cs

@@ -53,6 +53,24 @@ static void MenuPerform_NewPolyShapeToggle()
 			}
 		}
 
+		[MenuItem(k_MenuPrefix + "Editors/New Shape Toggle %#k", true, PreferenceKeys.menuEditor + 1)]
+		static bool MenuVerify_NewShapeToggle()
+		{
+			var instance = EditorToolbarLoader.GetInstance<NewShapeToggle>();
+			return instance != null && instance.enabled;
+		}
+
+		[MenuItem(k_MenuPrefix + "Editors/New Shape Toggle %#k", false, PreferenceKeys.menuEditor + 1)]
+		static void MenuPerform_NewShapeToggle()
+		{
+			var instance = EditorToolbarLoader.GetInstance<NewShapeToggle>();
+			if(instance != null && instance.enabled)
+			{
+				EditorUtility.ShowNotification(instance.PerformAction().notification);
+				ProBuilderAnalytics.SendActionEvent(instance, ProBuilderAnalytics.TriggerType.MenuOrShortcut);
+			}
+		}
+
 		[MenuItem(k_MenuPrefix + "Editors/Open Lightmap UV Editor", true, PreferenceKeys.menuEditor + 1)]
 		static bool MenuVerify_OpenLightmapUVEditor()
 		{
@@ -323,15 +341,15 @@ static void MenuPerform_ConformFaceNormals()
 			}
 		}
 
-		[MenuItem(k_MenuPrefix + "Geometry/Delete Faces [⌫]", true, PreferenceKeys.menuGeometry + 3)]
+		[MenuItem(k_MenuPrefix + "Geometry/Delete Faces [backspace]", true, PreferenceKeys.menuGeometry + 3)]
 		static bool MenuVerify_DeleteFaces()
 		{
 			var instance = EditorToolbarLoader.GetInstance<DeleteFaces>();
 			return instance != null && instance.enabled;
 		}
 
 		[Shortcut(k_ShortcutPrefix + "Geometry/Delete Faces", typeof(UnityEditor.SceneView), (KeyCode) 8, (ShortcutModifiers) 0)]
-		[MenuItem(k_MenuPrefix + "Geometry/Delete Faces [⌫]", false, PreferenceKeys.menuGeometry + 3)]
+		[MenuItem(k_MenuPrefix + "Geometry/Delete Faces [backspace]", false, PreferenceKeys.menuGeometry + 3)]
 		static void MenuPerform_DeleteFaces()
 		{
 			var instance = EditorToolbarLoader.GetInstance<DeleteFaces>();

Editor/MenuActions/Editors/NewBezierShape.cs

@@ -26,7 +26,7 @@ public override bool hidden
 
         public override bool enabled
         {
-            get { return true; }
+            get { return Experimental.experimentalFeaturesEnabled && ProBuilderEditor.instance != null; }
         }
 
         protected override ActionResult PerformActionImplementation()

Editor/MenuActions/Editors/NewPolyShapeToggle.cs

@@ -34,7 +34,7 @@ public override bool hidden
 
         public override bool enabled
         {
-            get { return true; }
+            get { return ProBuilderEditor.instance != null; }
         }
 
         static bool CanCreateNewPolyShape()

Editor/MenuActions/Editors/NewShapeToggle.cs

@@ -18,7 +18,6 @@ sealed class NewShapeToggle : MenuToolToggle
         public override TooltipContent tooltip { get { return s_Tooltip; } }
         public override string menuTitle { get { return "New Shape"; } }
         public override int toolbarPriority { get { return 0; } }
-        protected override bool hasFileMenuEntry { get { return false; } }
 
         static readonly TooltipContent s_Tooltip = new TooltipContent
             (
@@ -27,8 +26,9 @@ sealed class NewShapeToggle : MenuToolToggle
                 keyCommandSuper, keyCommandShift, 'K'
             );
 
-        public override bool enabled {
-            get { return true; }
+        public override bool enabled
+        {
+            get { return ProBuilderEditor.instance != null; }
         }
 
         protected override ActionResult PerformActionImplementation()