From 87d06547b8f5e2e1d08878ff3f712a4cd7fe0c43 Mon Sep 17 00:00:00 2001 From: MattNL Date: Thu, 3 Nov 2022 21:41:24 -0400 Subject: [PATCH] COLEditor trees now filter out duplicate entries --- PCK-Studio/Forms/Editor/COLEditor.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index b958b519..8ac3fb19 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -88,19 +88,26 @@ namespace PckStudio.Forms.Editor COLFile temp = targetVersion ? default_colourfile : colourfile; + List CurrentEntries = new List(); + foreach (var obj in temp.entries) { COLFile.ColorEntry entry = colourfile.entries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); tn.Tag = entry != null ? entry : obj; + if (CurrentEntries.Contains(obj.name)) continue; + CurrentEntries.Add(obj.name); colorTreeView.Nodes.Add(tn); colorCache.Add(tn); } + CurrentEntries.Clear(); foreach (var obj in temp.waterEntries) { COLFile.ExtendedColorEntry entry = colourfile.waterEntries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); tn.Tag = entry != null ? entry : obj; + if (CurrentEntries.Contains(obj.name)) continue; + CurrentEntries.Add(obj.name); waterTreeView.Nodes.Add(tn); waterCache.Add(tn); TreeNode tnB = new TreeNode(obj.name);