瀏覽代碼

Sujith :) ->
1. Removed broken prefab reference

sujith 1 月之前
父節點
當前提交
cc8d6de0fc
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Assets/GitMerge/Editor/GitMergeWindow.cs

+ 3 - 3
Assets/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);
         }