Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-24 06:57:49 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VRM10ExportDialog use VRM10MetaEditor

Browse Source
This commit is contained in:
ousttrue 2021-06-21 19:17:51 +09:00
parent 61d77b2989
commit c6cb7e9df3
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Editor/SerializedPropertyEditor/SerializedPropertyEditor.cs
View File

@ -27,7 +27,7 @@ namespace UniGLTF
return new SerializedPropertyEditor(serializedObject, prop);
}
public void OnGUI()
public void OnInspectorGUI()
{
RecursiveProperty(m_rootProperty);
}

8
Assets/VRM10/Editor/Components/VRM10ObjectEditor.cs
View File

@ -51,19 +51,19 @@ namespace UniVRM10
switch (_tab)
{
case Tabs.Meta:
m_meta.OnGUI();
m_meta.OnInspectorGUI();
break;
case Tabs.Expression:
m_expression.OnGUI();
m_expression.OnInspectorGUI();
break;
case Tabs.LookAt:
m_lookAt.OnGUI();
m_lookAt.OnInspectorGUI();
break;
case Tabs.FirstPerson:
m_firstPerson.OnGUI();
m_firstPerson.OnInspectorGUI();
break;
}
serializedObject.ApplyModifiedProperties();

9
Assets/VRM10/Editor/Vrm10ExportDialog.cs
View File

@ -60,16 +60,13 @@ namespace UniVRM10
}
if (m_metaEditor != null)
{
UnityEditor.Editor.DestroyImmediate(m_metaEditor);
m_metaEditor = null;
}
m_meta = value;
}
}
VRM10Object m_tmpObject;
Editor m_metaEditor;
VRM10MetaEditor m_metaEditor;
protected override void Initialize()
{
@ -245,11 +242,11 @@ namespace UniVRM10
{
if (m_meta != null)
{
m_metaEditor = Editor.CreateEditor(Vrm);
m_metaEditor = VRM10MetaEditor.Create(new SerializedObject(Vrm));
}
else
{
m_metaEditor = Editor.CreateEditor(m_tmpObject);
m_metaEditor = VRM10MetaEditor.Create(new SerializedObject(m_tmpObject));
}
}
m_metaEditor.OnInspectorGUI();