UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-20 01:06:01 +08:00
Code

Fix NullReferenceException

Browse Source 
- Initialized "culledNodes" field to avoid rare NullReferenceException on line 440
- Slight performance boost using cached HashSets instead of allocating new lists DrawNodes() call, also O(1) lookup time for graphs with many selected/culled nodes
This commit is contained in:
Trice Helix 2023-03-12 20:31:00 +01:00 committed by GitHub
parent 5967cef277
commit c9685e9155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Scripts/Editor/NodeEditorGUI.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
@ -12,8 +12,8 @@ namespace XNodeEditor {
/// <summary> Contains GUI methods </summary>
public partial class NodeEditorWindow {
public NodeGraphEditor graphEditor;
private List<UnityEngine.Object> selectionCache;
private List<XNode.Node> culledNodes;
private readonly HashSet<UnityEngine.Object> selectionCache = new();
private readonly HashSet<XNode.Node> culledNodes = new();
/// <summary> 19 if docked, 22 if not </summary>
private int topPadding { get { return isDocked() ? 19 : 22; } }
/// <summary> Executed after all other window GUI. Useful if Zoom is ruining your day. Automatically resets after being run.</summary>
@ -399,8 +399,13 @@ namespace XNodeEditor {
private void DrawNodes() {
Event e = Event.current;
if (e.type == EventType.Layout) {
selectionCache = new List<UnityEngine.Object>(Selection.objects);
selectionCache.Clear();
var objs = Selection.objects;
selectionCache.EnsureCapacity(objs.Length);
foreach (var obj in objs)
selectionCache.Add(obj);
}
System.Reflection.MethodInfo onValidate = null;
@ -432,7 +437,7 @@ namespace XNodeEditor {
List<XNode.NodePort> removeEntries = new List<XNode.NodePort>();
if (e.type == EventType.Layout) culledNodes = new List<XNode.Node>();
if (e.type == EventType.Layout) culledNodes.Clear();
for (int n = 0; n < graph.nodes.Count; n++) {
// Skip null nodes. The user could be in the process of renaming scripts, so removing them at this point is not advisable.
if (graph.nodes[n] == null) continue;