From 3220a98e0ca23c17ecdf8ef451ceba6dc6b53c0a Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 6 Apr 2018 23:00:40 +0900 Subject: [PATCH] fix meta export --- Scripts/Format/Editor/VRMExporter.cs | 4 ++-- Scripts/Format/glTF_VRM_Meta.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Scripts/Format/Editor/VRMExporter.cs b/Scripts/Format/Editor/VRMExporter.cs index 1f14c3c34..19800ebfe 100644 --- a/Scripts/Format/Editor/VRMExporter.cs +++ b/Scripts/Format/Editor/VRMExporter.cs @@ -185,8 +185,8 @@ namespace VRM // ussage pemission gltf.extensions.VRM.meta.allowedUser = meta.AllowedUser; gltf.extensions.VRM.meta.violentUssage = meta.ViolentUssage; - gltf.extensions.VRM.meta.sexualUssage = meta.ViolentUssage; - gltf.extensions.VRM.meta.commercialUssage = meta.ViolentUssage; + gltf.extensions.VRM.meta.sexualUssage = meta.SexualUssage; + gltf.extensions.VRM.meta.commercialUssage = meta.CommercialUssage; gltf.extensions.VRM.meta.otherPermissionUrl = meta.OtherPermissionUrl; // distribution license diff --git a/Scripts/Format/glTF_VRM_Meta.cs b/Scripts/Format/glTF_VRM_Meta.cs index 761b6f6da..9b2daafe1 100644 --- a/Scripts/Format/glTF_VRM_Meta.cs +++ b/Scripts/Format/glTF_VRM_Meta.cs @@ -71,24 +71,28 @@ namespace VRM allowedUserName = value.ToString(); } } + public string violentUssageName; public UssageLicense violentUssage { get { return FromString(violentUssageName); } set { violentUssageName = value.ToString(); } } + public string sexualUssageName; public UssageLicense sexualUssage { get { return FromString(sexualUssageName); } set { sexualUssageName = value.ToString(); } } + public string commercialUssageName; public UssageLicense commercialUssage { get { return FromString(commercialUssageName); } set { commercialUssageName = value.ToString(); } } + public string otherPermissionUrl; #endregion