diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
index 7e455a320..2d70ca24c 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
@@ -248,7 +248,7 @@ namespace UniGLTF
/// Root ヒエラルキーで使っているリソース
///
///
- public virtual IEnumerable ResourcesInRootHierarchy()
+ public virtual IEnumerable ModelOwnResources()
{
foreach (var mesh in Meshes)
{
@@ -271,7 +271,7 @@ namespace UniGLTF
public UnityResourceDestroyer DisposeOnGameObjectDestroyed()
{
var destroyer = Root.AddComponent();
- foreach (var x in ResourcesInRootHierarchy())
+ foreach (var x in ModelOwnResources())
{
destroyer.Resources.Add(x);
}
diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs
index 195f6044b..312191a52 100644
--- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs
+++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs
@@ -3,7 +3,6 @@ using System.Linq;
using System.Collections.Generic;
using UniGLTF;
using UnityEngine;
-using System.IO;
using UniJSON;
using UniGLTF.AltTask;
@@ -298,8 +297,23 @@ namespace VRM
return meta;
}
+
+ public override IEnumerable ModelOwnResources()
+ {
+ foreach (var x in base.ModelOwnResources())
+ {
+ yield return x;
+ }
+
+ // VRM 固有のリソース(ScriptableObject)
+ yield return HumanoidAvatar;
+ yield return AvatarDescription;
+ yield return Meta;
+ foreach (var x in BlendShapeAvatar.Clips)
+ {
+ yield return x;
+ }
+ yield return BlendShapeAvatar;
+ }
}
-
-
-
}