Clear VisjectSurface node caches and context menus during scripts reload

Source/Editor/Surface/AnimGraphSurface.cs

@@ -19,6 +19,8 @@ namespace FlaxEditor.Surface
     [HideInEditor]
     public class AnimGraphSurface : VisjectSurface
     {
+        private static NodesCache _nodesCache = new NodesCache(IterateNodesCache);
+
         private static readonly List<GroupArchetype> StateMachineGroupArchetypes = new List<GroupArchetype>(new[]
         {
             // Customized Animations group with special nodes to use here
@@ -87,8 +89,6 @@ namespace FlaxEditor.Surface
             }
         };
 
-        private static NodesCache _nodesCache = new NodesCache(IterateNodesCache);
-
         /// <summary>
         /// The state machine editing context menu.
         /// </summary>
@@ -158,6 +158,8 @@ namespace FlaxEditor.Surface
 
         private void OnScriptsReloadBegin()
         {
+            _nodesCache.Clear();
+
             // Check if any of the nodes comes from the game scripts - those can be reloaded at runtime so prevent crashes
             bool hasTypeFromGameScripts = Editor.Instance.CodeEditing.AnimGraphNodes.HasTypeFromGameScripts;
 

Source/Editor/Surface/BehaviorTreeSurface.cs

@@ -24,6 +24,7 @@ namespace FlaxEditor.Surface
         public BehaviorTreeSurface(IVisjectSurfaceOwner owner, Action onSave, FlaxEditor.Undo undo)
         : base(owner, onSave, undo, CreateStyle())
         {
+            ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
         }
 
         private static SurfaceStyle CreateStyle()
@@ -35,6 +36,11 @@ namespace FlaxEditor.Surface
             return style;
         }
 
+        private void OnScriptsReloadBegin()
+        {
+            _nodesCache.Clear();
+        }
+
         private static void DrawBox(Box box)
         {
             var rect = new Rectangle(Float2.Zero, box.Size);
@@ -186,6 +192,7 @@ namespace FlaxEditor.Surface
         {
             if (IsDisposing)
                 return;
+            ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
             _nodesCache.Wait();
 
             base.OnDestroy();

Source/Editor/Surface/VisjectSurface.cs

@@ -397,6 +397,15 @@ namespace FlaxEditor.Surface
             // Init drag handlers
             DragHandlers.Add(_dragAssets = new DragAssets<DragDropEventArgs>(ValidateDragItem));
             DragHandlers.Add(_dragParameters = new DragNames<DragDropEventArgs>(SurfaceParameter.DragPrefix, ValidateDragParameter));
+
+            ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
+        }
+
+        private void OnScriptsReloadBegin()
+        {
+            _activeVisjectCM = null;
+            _cmPrimaryMenu?.Dispose();
+            _cmPrimaryMenu = null;
         }
 
         /// <summary>
@@ -995,6 +1004,8 @@ namespace FlaxEditor.Surface
             _activeVisjectCM = null;
             _cmPrimaryMenu?.Dispose();
 
+            ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
+
             base.OnDestroy();
         }
     }

Source/Editor/Surface/VisualScriptSurface.cs

@@ -55,6 +55,12 @@ namespace FlaxEditor.Surface
         {
             _supportsImplicitCastFromObjectToBoolean = true;
             DragHandlers.Add(_dragActors = new DragActors(ValidateDragActor));
+            ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
+        }
+
+        private void OnScriptsReloadBegin()
+        {
+            _nodesCache.Clear();
         }
 
         private bool ValidateDragActor(ActorNode actor)
@@ -596,6 +602,7 @@ namespace FlaxEditor.Surface
         {
             if (IsDisposing)
                 return;
+            ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
             _nodesCache.Wait();
 
             base.OnDestroy();