diff --git a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs index 2efa03a14..d0472959a 100644 --- a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs +++ b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs @@ -180,30 +180,7 @@ namespace VRM.DevOnly.PackageExporter 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( diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs index 1872b82aa..0416aac32 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs @@ -465,6 +465,7 @@ namespace VRM AssetDatabase.ImportAsset(path.ToUnityRelativePath()); } } +#endif //ここで重複ボーン名のチェックをする bool DuplicateBoneNameExists() @@ -477,6 +478,5 @@ namespace VRM return (duplicates.Any()); } -#endif } } \ No newline at end of file