Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-14 14:29:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed build error #93

Browse Source
This commit is contained in:
ousttrue 2018-12-28 14:47:19 +09:00
parent 17f87a44e8
commit 5c7e7b0627
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Scripts/Format/VRMImporterContext.cs
View File

@ -17,20 +17,6 @@ namespace VRM
{
}
public override bool IsOverwrite(UnityEngine.Object o)
{
if(o is BlendShapeAvatar)
{
return false;
}
if(o is BlendShapeClip)
{
return false;
}
return base.IsOverwrite(o);
}
public override void Parse(string path, byte[] bytes)
{
var ext = Path.GetExtension(path).ToLower();
@ -332,7 +318,6 @@ namespace VRM
return meta;
}
#if UNITY_EDITOR
protected override IEnumerable<UnityEngine.Object> ObjectsForSubAsset()
{
foreach (var x in base.ObjectsForSubAsset())
@ -355,6 +340,21 @@ namespace VRM
yield return Meta;
}
#if UNITY_EDITOR
public override bool IsOverwrite(UnityEngine.Object o)
{
if (o is BlendShapeAvatar)
{
return false;
}
if (o is BlendShapeClip)
{
return false;
}
return base.IsOverwrite(o);
}
protected override UnityPath GetAssetPath(UnityPath prefabPath, UnityEngine.Object o)
{
if (o is BlendShapeAvatar

2
UniGLTF

@ -1 +1 @@
Subproject commit 232818e03cb9ee703dc5ced5aae82e95ceeef2ce
Subproject commit 690847a1a5a0bd3df55187e1f1cb6f338c09225b