Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-13 06:20:01 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UnityObjectManager is not unnecessary for prefab

Browse Source
This commit is contained in:
ousttrue
2021-06-11 17:12:13 +09:00
parent 4db1711410
commit 423889cb05
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs
View File

@@ -55,9 +55,11 @@ namespace UniGLTF
{
context.AddObjectToAsset(k.Name, o);
});
var root = loaded.Root;
GameObject.DestroyImmediate(loaded);
context.AddObjectToAsset(loaded.name, loaded.gameObject);
context.SetMainObject(loaded.gameObject);
context.AddObjectToAsset(root.name, root);
context.SetMainObject(root);
}
}
}

6
Assets/VRM/Editor/Format/VRMEditorImporterContext.cs
View File

@@ -139,18 +139,20 @@ namespace VRM
m_paths.Clear();
m_paths.Add(m_prefabPath);
loaded.TransferOwnership(SaveAsAsset);
var root = loaded.Root;
GameObject.DestroyImmediate(loaded);
// Create or update Main Asset
if (m_prefabPath.IsFileExists)
{
Debug.LogFormat("replace prefab: {0}", m_prefabPath);
var prefab = m_prefabPath.LoadAsset<GameObject>();
PrefabUtility.SaveAsPrefabAssetAndConnect(loaded.gameObject, m_prefabPath.Value, InteractionMode.AutomatedAction);
PrefabUtility.SaveAsPrefabAssetAndConnect(root, m_prefabPath.Value, InteractionMode.AutomatedAction);
}
else
{
Debug.LogFormat("create prefab: {0}", m_prefabPath);
PrefabUtility.SaveAsPrefabAssetAndConnect(loaded.gameObject, m_prefabPath.Value, InteractionMode.AutomatedAction);
PrefabUtility.SaveAsPrefabAssetAndConnect(root, m_prefabPath.Value, InteractionMode.AutomatedAction);
}
foreach (var x in m_paths)

6
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
View File

@@ -49,9 +49,11 @@ namespace UniVRM10
{
context.AddObjectToAsset(key.Name, o);
});
var root = loaded.Root;
GameObject.DestroyImmediate(loaded);
context.AddObjectToAsset(loaded.name, loaded.gameObject);
context.SetMainObject(loaded.gameObject);
context.AddObjectToAsset(root.name, root);
context.SetMainObject(root);
}
}
}