diff --git a/Assets/VRM10/Runtime/IO/Vrm10Data.cs b/Assets/VRM10/Runtime/IO/Vrm10Data.cs index d9d8b7853..fa5c493b3 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Data.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Data.cs @@ -76,8 +76,16 @@ namespace UniVRM10 return null; } } + catch (MigrationException ex) + { + // migration 失敗 + vrm1Data = default; + migration = new MigrationData(ex.Message, oldMeta); + return null; + } catch (Exception ex) { + // その他のエラー vrm1Data = default; migration = new MigrationData(ex.Message, oldMeta); return null; diff --git a/Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs b/Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs index 3b87c2b9b..bab234c7d 100644 --- a/Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs +++ b/Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs @@ -171,8 +171,9 @@ namespace UniVRM10 } else { - // different otherLicenseUrl & otherPermissionUrl - throw new MigrationException("otherPermissionUrl", "can not migrate"); + // https://github.com/vrm-c/UniVRM/issues/1611 + // 両方を記述しエラーとしない + meta.OtherLicenseUrl = $"'{otherLicenseUrl}', '{otherPermissionUrl}'"; } } else if (!string.IsNullOrEmpty(otherLicenseUrl))