Merge pull request #1372 from anatawa12/prefab-on-launch-unity

fix: prefab overrides are reverted on first load of the scene at first launch
anatawa12 · Dec 22, 2024 · 5297c6e · 5297c6e
2 parents 8897af7 + 5bbe3f4
commit 5297c6e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Prefab overrides on the scene are reverted on first load of the scene at first launch `#1372`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Prefab overrides on the scene are reverted on first load of the scene at first launch `#1372`
 
 ### Security
 

diff --git a/...rnal/PrefabSafeSet/Editor/UniqueCollection/PrefabSafeUniqueCollectionRuntimeEditorImpl.cs b/...rnal/PrefabSafeSet/Editor/UniqueCollection/PrefabSafeUniqueCollectionRuntimeEditorImpl.cs
@@ -39,7 +39,8 @@ public static void OnValidate<TComponent>(TComponent component,
             var newCorrespondingObject = PrefabUtility.GetCorrespondingObjectFromSource(component);
             if (newCorrespondingObject != null &&
                 PrefabUtility.GetCorrespondingObjectFromSource(newCorrespondingObject) ==
-                PrefabSafeUniqueCollection.CorrespondingObject)
+                PrefabSafeUniqueCollection.CorrespondingObject
+                && !PrefabSafeUniqueCollection.IsNew) // not loading scene
             {
                 // this might be creating prefab. we do more checks
                 var newCorrespondingPrefabSafeUniqueCollection = getPrefabSafeUniqueCollection(newCorrespondingObject);