From e05eedfc76d88a2b54ce2df944d19edb0f67d954 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Thu, 25 Jul 2024 17:28:55 -0500
Subject: [PATCH 1/2] Force rebuild on proxy changes if rebuild is true

---
 Source/Editor/Modules/ContentDatabaseModule.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Modules/ContentDatabaseModule.cs b/Source/Editor/Modules/ContentDatabaseModule.cs
index 0e4e96d30..8672c7e64 100644
--- a/Source/Editor/Modules/ContentDatabaseModule.cs
+++ b/Source/Editor/Modules/ContentDatabaseModule.cs
@@ -737,7 +737,7 @@ namespace FlaxEditor.Modules
         {
             Proxy.Insert(0, proxy);
             if (rebuild)
-                Rebuild();
+                Rebuild(true);
         }
 
         /// <summary>
@@ -749,7 +749,7 @@ namespace FlaxEditor.Modules
         {
             Proxy.Remove(proxy);
             if (rebuild)
-                Rebuild();
+                Rebuild(true);
         }
 
         /// <summary>
@@ -1275,10 +1275,6 @@ namespace FlaxEditor.Modules
                 }
                 _dirtyNodes.Clear();
             }
-
-            // Lazy-rebuilds
-            if (_rebuildFlag)
-                RebuildInternal();
         }
 
         /// <inheritdoc />

From 074751f91f41114d769adbb235cffeae51e7804a Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Thu, 25 Jul 2024 18:23:26 -0500
Subject: [PATCH 2/2] Re-add lazy rebuilds

---
 Source/Editor/Modules/ContentDatabaseModule.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/Editor/Modules/ContentDatabaseModule.cs b/Source/Editor/Modules/ContentDatabaseModule.cs
index 8672c7e64..6d2821a28 100644
--- a/Source/Editor/Modules/ContentDatabaseModule.cs
+++ b/Source/Editor/Modules/ContentDatabaseModule.cs
@@ -1275,6 +1275,12 @@ namespace FlaxEditor.Modules
                 }
                 _dirtyNodes.Clear();
             }
+
+            // Lazy-rebuilds
+            if (_rebuildFlag)
+            {
+                RebuildInternal();
+            }
         }
 
         /// <inheritdoc />