mirror of
https://github.com/vrm-c/UniVRM.git
synced 2026-08-20 17:45:22 -05:00
otherLicenseUrl != otherPermissionUrl をエラーとしない
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user