Fix foe EditShapeTool that does not close

Author: lopezt-unity

Editor/EditorCore/EditShapeTool.cs

@@ -99,17 +99,17 @@ void OnEnable()
 
 #if !UNITY_2020_2_OR_NEWER
             ToolManager.activeToolChanging += ActiveToolChanging;
-#endif
             ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
+#endif
 
         }
 
         void OnDisable()
         {
 #if !UNITY_2020_2_OR_NEWER
             ToolManager.activeToolChanging -= ActiveToolChanging;
-#endif
             ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
+#endif
             if(m_ShapeEditor != null)
                 DestroyImmediate(m_ShapeEditor);
         }
@@ -131,13 +131,21 @@ void ChangeToObjectMode()
         public override void OnActivated()
         {
             base.OnActivated();
+            ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
             EditorApplication.delayCall += () => ProBuilderEditor.selectMode = SelectMode.Object;
         }
 
         public override void OnWillBeDeactivated()
         {
             base.OnWillBeDeactivated();
-            EditorApplication.delayCall += () => ProBuilderEditor.ResetToLastSelectMode();
+            ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
+            EditorApplication.delayCall += () => ResetToLastSelectMode();
+        }
+
+        public void ResetToLastSelectMode()
+        {
+            if(ProBuilderToolManager.activeTool != Tool.Custom)
+                ProBuilderEditor.ResetToLastSelectMode();
         }
 #endif
 

Editor/EditorCore/ProBuilderEditor.cs

@@ -46,7 +46,7 @@ public sealed class ProBuilderEditor : EditorWindow, IHasCustomMenu
 
         EditorToolbar m_Toolbar;
         ProBuilderToolManager m_ToolManager; // never use this directly! use toolManager getter to avoid problems with multiple editor instances
-        static ProBuilderToolManager toolManager => s_Instance != null ? s_Instance.m_ToolManager : null;
+        internal static ProBuilderToolManager toolManager => s_Instance != null ? s_Instance.m_ToolManager : null;
         internal EditorToolbar toolbar => m_Toolbar; // used by unit tests
         static ProBuilderEditor s_Instance;