fixing editshapetool when leaving play mode

Author: lopezt-unity

Editor/EditorCore/EditShapeTool.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using UnityEngine;
 using UnityEditor.EditorTools;
-using UnityEditor.IMGUI.Controls;
 using UnityEngine.ProBuilder;
 using UnityEngine.ProBuilder.Shapes;
 using Math = UnityEngine.ProBuilder.Math;
@@ -97,11 +96,13 @@ void OnEnable()
             for(int i = 0; i < s_ArrowsLines.Length; i++)
                 s_ArrowsLines[i] = new Vector3[3];
 
+            m_ShapeEditor = Editor.CreateEditor(targets.ToArray(), typeof(ProBuilderShapeEditor));
+            EditorApplication.playModeStateChanged += PlaymodeStateChanged ;
+
 #if !UNITY_2020_2_OR_NEWER
             ToolManager.activeToolChanging += ActiveToolChanging;
             ProBuilderEditor.selectModeChanged += OnSelectModeChanged;
 #endif
-
         }
 
         void OnDisable()
@@ -110,8 +111,22 @@ void OnDisable()
             ToolManager.activeToolChanging -= ActiveToolChanging;
             ProBuilderEditor.selectModeChanged -= OnSelectModeChanged;
 #endif
+            EditorApplication.playModeStateChanged -= PlaymodeStateChanged ;
+
+            if(m_ShapeEditor != null)
+                DestroyImmediate(m_ShapeEditor);
+        }
+
+        void PlaymodeStateChanged(PlayModeStateChange stateChange)
+        {
+            if(stateChange == PlayModeStateChange.ExitingEditMode
+               || stateChange == PlayModeStateChange.ExitingPlayMode)
+                return;
+
             if(m_ShapeEditor != null)
                 DestroyImmediate(m_ShapeEditor);
+
+            m_ShapeEditor = Editor.CreateEditor(targets.ToArray(), typeof(ProBuilderShapeEditor));
         }
 
 #if !UNITY_2020_2_OR_NEWER
@@ -186,8 +201,6 @@ void OnOverlayGUI(Object obj, SceneView view)
                     EditorSnapSettings.gridSnapEnabled = EditorGUILayout.Toggle("Grid Snapping", EditorSnapSettings.gridSnapEnabled);
             }
 #endif
-            Editor.CreateCachedEditor(targets.ToArray(), typeof(ProBuilderShapeEditor), ref m_ShapeEditor);
-
             using(new EditorGUILayout.VerticalScope(new GUIStyle(EditorStyles.frameBox)))
             {
                 ( (ProBuilderShapeEditor) m_ShapeEditor ).DrawShapeGUI(null);