Browse Source

Sujith :) ->
1. Reverted broken prefab asset

sujith 1 month ago
parent
commit
67db286aec

+ 3 - 3
Assets/Better Git/GitMerge/Editor/GitMergeWindow.cs

@@ -253,9 +253,9 @@ namespace GitMerge
         {
             var assetType = asset.GetType();
             return assetType == typeof(GameObject) ||
-// #if UNITY_2022_3_OR_NEWER
-//                    assetType == typeof(BrokenPrefabAsset) ||
-// #endif
+#if UNITY_2022_3_OR_NEWER
+                   assetType == typeof(BrokenPrefabAsset) ||
+#endif
                    assetType == typeof(DefaultAsset);
         }
 

+ 1 - 1
Assets/Scenes/SampleScene.unity

@@ -436,7 +436,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 254937477822833254, guid: 20ea0bfd22b354d0fbe4e2c4e2ae2ef0, type: 3}
       propertyPath: m_Name
-      value: Shakesphere1111
+      value: Shakesphere1324
       objectReference: {fileID: 0}
     - target: {fileID: 1917423583392372291, guid: 20ea0bfd22b354d0fbe4e2c4e2ae2ef0, type: 3}
       propertyPath: m_LocalPosition.x