From 795da421975ef4da3a89decaba65ada2fcffc647 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 8 Jan 2021 15:05:45 +0700 Subject: [PATCH] fix 2019 deprecation warnings --- .../Editor/FTEditor/Editors/SwfClipAssetEditor.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs index cf36777..36506aa 100644 --- a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs +++ b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs @@ -57,14 +57,12 @@ namespace FTEditor.Editors { if ( clip_go ) { var prefab_path = GetPrefabPath(clip); if ( !string.IsNullOrEmpty(prefab_path) ) { - var prefab = AssetDatabase.LoadMainAssetAtPath(prefab_path); - if ( !prefab ) { - prefab = PrefabUtility.CreateEmptyPrefab(prefab_path); - } - result = PrefabUtility.ReplacePrefab( - clip_go, - prefab, - ReplacePrefabOptions.ConnectToPrefab); + prefab_path = AssetDatabase.GenerateUniqueAssetPath(prefab_path); + #if UNITY_2018_3_OR_NEWER + result = PrefabUtility.SaveAsPrefabAsset(clip_go, prefab_path); + #else + result = PrefabUtility.CreatePrefab(prefab_path, clip_go); + #endif } GameObject.DestroyImmediate(clip_go, true); }