From 627b1cee103b58fe42324d72e6fa69323834f508 Mon Sep 17 00:00:00 2001
From: Menotdan <32620310+Menotdan@users.noreply.github.com>
Date: Wed, 10 May 2023 17:49:45 -0400
Subject: [PATCH] Resolve issues that came through when attempting to merge
previously.
---
Source/Editor/Content/Items/ContentFolder.cs | 1 +
Source/Editor/Content/Items/ContentItem.cs | 2 ++
Source/Editor/Utilities/Utils.cs | 1 +
3 files changed, 4 insertions(+)
diff --git a/Source/Editor/Content/Items/ContentFolder.cs b/Source/Editor/Content/Items/ContentFolder.cs
index a654ea697..86c374fee 100644
--- a/Source/Editor/Content/Items/ContentFolder.cs
+++ b/Source/Editor/Content/Items/ContentFolder.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Text;
using FlaxEditor.GUI.Drag;
using FlaxEngine;
using FlaxEngine.GUI;
diff --git a/Source/Editor/Content/Items/ContentItem.cs b/Source/Editor/Content/Items/ContentItem.cs
index 60adb1caa..2a0390b30 100644
--- a/Source/Editor/Content/Items/ContentItem.cs
+++ b/Source/Editor/Content/Items/ContentItem.cs
@@ -2,6 +2,8 @@
using System;
using System.Collections.Generic;
+using System.IO;
+using System.Text;
using FlaxEditor.Content.GUI;
using FlaxEditor.GUI.Drag;
using FlaxEngine;
diff --git a/Source/Editor/Utilities/Utils.cs b/Source/Editor/Utilities/Utils.cs
index 614c4cdc7..acc0cf605 100644
--- a/Source/Editor/Utilities/Utils.cs
+++ b/Source/Editor/Utilities/Utils.cs
@@ -1030,6 +1030,7 @@ namespace FlaxEditor.Utilities
return path;
}
+ ///
/// Gets the asset name relative to the project root folder (without asset file extension)
///
/// The asset path.