Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-13 22:09:53 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

otherLicenseUrl != otherPermissionUrl をエラーとしない

Browse Source
This commit is contained in:
ousttrue 2022-04-15 17:47:33 +09:00
parent 8f6e6d689a
commit 30996cb03c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/VRM10/Runtime/IO/Vrm10Data.cs
View File

@ -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;

5
Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs
View File

@ -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))