From 30996cb03c0eb6fa888b1ffcb7d3393fbb766694 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 15 Apr 2022 17:47:33 +0900 Subject: [PATCH] =?UTF-8?q?otherLicenseUrl=20!=3D=20otherPermissionUrl=20?= =?UTF-8?q?=E3=82=92=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM10/Runtime/IO/Vrm10Data.cs | 8 ++++++++ Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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))