From b148a6f0084090907c6681d1b3677567fcebe7a7 Mon Sep 17 00:00:00 2001 From: hiroj Date: Wed, 20 May 2020 20:13:12 +0900 Subject: [PATCH 1/2] Changed to include adf --- .../DevOnly/Editor/VRMExportUnityPackage.cs | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs index 2efa03a141..d0472959a7 100644 --- a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs +++ b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs @@ -180,30 +180,7 @@ public static void CreateUnityPackage( string[] fileNames ) { - CreateUnityPackageWithoutAsmDefs(outputDir, name, containsPath, basePath, fileNames); - CreateUnityPackageOnlyWithAsmDefs(outputDir, name, containsPath, basePath, fileNames); - } - - public static void CreateUnityPackageWithoutAsmDefs( - string outputDir, - string name, - string[] containsPath, - string basePath, - string[] fileNames - ) - { - CreateUnityPackageStandalone(outputDir, name, containsPath, basePath, fileNames, null, new string[] {".asmdef"}); - } - - public static void CreateUnityPackageOnlyWithAsmDefs( - string outputDir, - string name, - string[] containsPath, - string basePath, - string[] fileNames - ) - { - CreateUnityPackageStandalone(outputDir, name + ".asmdef", containsPath, basePath, fileNames, new string[] {".asmdef"}, null); + CreateUnityPackageStandalone(outputDir, name, containsPath, basePath, fileNames, null, null); } public static void CreateUnityPackageStandalone( From c83a748b83f3f0ee4c717cf9150648344d633a86 Mon Sep 17 00:00:00 2001 From: hiroj Date: Wed, 20 May 2020 20:20:54 +0900 Subject: [PATCH 2/2] fix editor func --- Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs index 1872b82aa1..0416aac328 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs @@ -465,6 +465,7 @@ void Export(string path, List destroy) AssetDatabase.ImportAsset(path.ToUnityRelativePath()); } } +#endif //ここで重複ボーン名のチェックをする bool DuplicateBoneNameExists() @@ -477,6 +478,5 @@ bool DuplicateBoneNameExists() return (duplicates.Any()); } -#endif } } \ No newline at end of file