From bc8a8b3a7f67c5eada950e3cfd3508546b91a1a6 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 29 Jun 2021 20:27:35 +0900 Subject: [PATCH] update VRM10MetaEditor --- Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs | 2 -- Assets/VRM10/Editor/Vrm10ExportDialog.cs | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs b/Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs index 4398a599d..fa61e3737 100644 --- a/Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs +++ b/Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs @@ -47,7 +47,6 @@ namespace UniVRM10 } EditorGUILayout.Separator(); - serializedObject.Update(); switch (_tab) { case Tabs.Meta: @@ -66,7 +65,6 @@ namespace UniVRM10 m_firstPerson.OnInspectorGUI(); break; } - serializedObject.ApplyModifiedProperties(); } } } diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs index aa96fdef1..409390317 100644 --- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs +++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs @@ -63,7 +63,7 @@ namespace UniVRM10 } } VRM10Object m_tmpObject; - (VRM10MetaEditor, SerializedObject) m_metaEditor; + VRM10MetaEditor m_metaEditor; protected override void Initialize() { @@ -235,7 +235,7 @@ namespace UniVRM10 switch (_tab) { case Tabs.Meta: - if (m_metaEditor.Item1 == null) + if (m_metaEditor == null) { SerializedObject so; if (m_meta != null) @@ -246,11 +246,9 @@ namespace UniVRM10 { so = new SerializedObject(m_tmpObject); } - m_metaEditor = (VRM10MetaEditor.Create(so), so); + m_metaEditor = VRM10MetaEditor.Create(so); } - m_metaEditor.Item2.Update(); - m_metaEditor.Item1.OnInspectorGUI(); - m_metaEditor.Item2.ApplyModifiedProperties(); + m_metaEditor.OnInspectorGUI(); break; case Tabs.Mesh: