Merge pull request #392 from Unity-Technologies/bugfix/1332226-missing-gizmos-menu-items

Fix for missing Gizmos Menu items for projects that have ProBuilder installed

Author: modrimkus

CHANGELOG.md

@@ -4,10 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
 ## [Unreleased]
 
 ### Bug Fixes
 
+- [case: 1332226] Fixed issue where some Gizmos menu items would be missing in projects that have ProBuilder package installed.
+
+## [5.0.3] - 2021-04-01
+
+### Bug Fixes
+
 - [case: 1324399] Fixing errors when building with prefabs in scene.
 - [case: 1323666] Preventing to assign an empty mesh as MeshCollider.
 - [case: 1322032] Fixing wrong ProBuilderMesh colors on domain reload when null.

Editor/EditorCore/HierarchyListener.cs

@@ -12,14 +12,7 @@ static class HierarchyListener
     {
         static HierarchyListener()
         {
-            // The inspector icon for ProBuilderMesh is set in the component metadata. However, this also serves as the
-            // scene view gizmo icon, which we do not want. To avoid drawing an icon for every mesh in the Scene View,
-            // we simply tell the AnnotationManager to not render the icon. This _does_ put ProBuilderMesh in the
-            // "Recently Changed" list, but only when it is modified the first time.
-            // The alternative method of setting an icon is to place it in a folder named "Editor Default Resources/Icons",
-            // however that requires that the resources directory be in "Assets", which we do not want to do.
-            EditorUtility.SetGizmoIconEnabled(typeof(ProBuilderMesh), false);
-
+            AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload;
             // When a prefab is updated, this is raised.  For some reason it's
             // called twice?
             EditorApplication.hierarchyChanged += HierarchyWindowChanged;
@@ -29,6 +22,17 @@ static HierarchyListener()
             PrefabUtility.prefabInstanceUpdated += PrefabInstanceUpdated;
         }
 
+        static void OnAfterAssemblyReload()
+        {
+            // The inspector icon for ProBuilderMesh is set in the component metadata. However, this also serves as the
+            // scene view gizmo icon, which we do not want. To avoid drawing an icon for every mesh in the Scene View,
+            // we simply tell the AnnotationManager to not render the icon. This _does_ put ProBuilderMesh in the
+            // "Recently Changed" list, but only when it is modified the first time.
+            // The alternative method of setting an icon is to place it in a folder named "Editor Default Resources/Icons",
+            // however that requires that the resources directory be in "Assets", which we do not want to do.
+            EditorApplication.delayCall += () => EditorUtility.SetGizmoIconEnabled(typeof(ProBuilderMesh), false);
+        }
+
         static void PrefabInstanceUpdated(GameObject go)
         {
             if (EditorApplication.isPlayingOrWillChangePlaymode)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.probuilder",
   "displayName": "ProBuilder",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "unity": "2019.4",
   "description": "Build, edit, and texture custom geometry in Unity. Use ProBuilder for in-scene level design, prototyping, collision meshes, all with on-the-fly play-testing.\n\nAdvanced features include UV editing, vertex colors, parametric shapes, and texture blending. With ProBuilder's model export feature it's easy to tweak your levels in any external 3D modelling suite.\n\nIf you are using URP/HDRP, be careful to also import the corresponding sample project in the section below to get the proper materials.",
   "keywords": [
@@ -58,4 +58,4 @@
     "url": "https://github.com/Unity-Technologies/com.unity.probuilder.git",
     "revision": "ea0bd0c969779f359c7ca6e065338ac39a93c86a"
   }
-}
+}

validationExceptions.json

@@ -0,0 +1,9 @@
+{
+    "Exceptions":
+    [
+        {
+             "ValidationTest": "API Validation",
+             "PackageVersion": "5.0.3"
+       }
+    ]
+}