From aefb95855ab1111996c7dd2938fd2c84f9e6c8fa Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 6 Apr 2018 22:48:14 +0900 Subject: [PATCH] meta var order --- Scripts/Format/glTF_VRM_Meta.cs | 2 +- Scripts/Meta/Editor/VRMMetaEditor.cs | 2 +- Scripts/Meta/VRMMetaObject.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Scripts/Format/glTF_VRM_Meta.cs b/Scripts/Format/glTF_VRM_Meta.cs index 4f8bc1979..761b6f6da 100644 --- a/Scripts/Format/glTF_VRM_Meta.cs +++ b/Scripts/Format/glTF_VRM_Meta.cs @@ -44,11 +44,11 @@ namespace VRM return UssageLicense.Disallow; } } + public string title; public string version; public string author; public string contactInformation; public string reference; - public string title; public int texture = -1; #region Ussage Permission diff --git a/Scripts/Meta/Editor/VRMMetaEditor.cs b/Scripts/Meta/Editor/VRMMetaEditor.cs index e07cf1f8e..1775c7afa 100644 --- a/Scripts/Meta/Editor/VRMMetaEditor.cs +++ b/Scripts/Meta/Editor/VRMMetaEditor.cs @@ -82,11 +82,11 @@ namespace VRM m_foldoutInfo = EditorGUILayout.Foldout(m_foldoutInfo, "Information"); if (m_foldoutInfo) { + EditorGUILayout.PropertyField(m_propMap["Title"]); EditorGUILayout.PropertyField(m_propMap["Version"]); EditorGUILayout.PropertyField(m_propMap["Author"]); EditorGUILayout.PropertyField(m_propMap["ContactInformation"]); EditorGUILayout.PropertyField(m_propMap["Reference"]); - EditorGUILayout.PropertyField(m_propMap["Title"]); var thumbnail = m_propMap["Thumbnail"]; thumbnail.objectReferenceValue = TextureField("", (Texture2D)thumbnail.objectReferenceValue, 100); } diff --git a/Scripts/Meta/VRMMetaObject.cs b/Scripts/Meta/VRMMetaObject.cs index 04ac869e9..6c6a3fa83 100644 --- a/Scripts/Meta/VRMMetaObject.cs +++ b/Scripts/Meta/VRMMetaObject.cs @@ -6,6 +6,9 @@ namespace VRM public class VRMMetaObject : ScriptableObject { #region Info + [SerializeField] + public string Title; + [SerializeField] public string Version; @@ -18,9 +21,6 @@ namespace VRM [SerializeField] public string Reference; - [SerializeField] - public string Title; - [SerializeField] public Texture2D Thumbnail; #endregion