Merge remote-tracking branch 'origin/master' into 1.9

2024-08-22 17:33:20 +02:00
parent ce1a1d6031 3ecb7c1d81
commit 20456d95e8
24 changed files with 269 additions and 88 deletions
--- a/Source/Editor/Modules/ContentDatabaseModule.cs
+++ b/Source/Editor/Modules/ContentDatabaseModule.cs
@@ -717,6 +717,9 @@ namespace FlaxEditor.Modules
        /// <param name="rebuild">Should rebuild entire database after addition.</param>
        public void AddProxy(ContentProxy proxy, bool rebuild = false)
        {
+            var oldProxy = Proxy.Find(x => x.GetType().ToString().Equals(proxy.GetType().ToString(), StringComparison.Ordinal));
+            if (oldProxy != null)
+                RemoveProxy(oldProxy);
            Proxy.Insert(0, proxy);
            if (rebuild)
                Rebuild(true);