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

Merge pull request #619 from ousttrue/fix/targetNames_length

Browse Source 
Fix/target names length
This commit is contained in:
hiroj
2020-11-17 17:04:13 +09:00
committed by GitHub
parent 75cc935bd6 04c064aa6e
commit 0b7f99734e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/VRM/DepthFirstScheduler/Schedulable.cs
View File

@@ -116,7 +116,8 @@ namespace DepthFirstScheduler
{
if (status == ExecutionStatus.Error)
{
throw x.GetError();
// throw x.GetError();
UnityEngine.Debug.LogException(x.GetError());
}
break;
}

13
Assets/VRM/UniGLTF/Scripts/IO/MeshImporter.cs
View File

@@ -405,16 +405,13 @@ namespace UniGLTF
if (prim.extras != null && prim.extras.targetNames != null)
{
var targetNames = prim.extras.targetNames;
for (int i = 1; i < gltfMesh.primitives.Count; ++i)
for (var i = 0; i < BlendShapes.Count; i++)
{
if (gltfMesh.primitives[i].targets.Count != targetNames.Count)
if (i >= targetNames.Count)
{
throw new FormatException(string.Format("different targets length: {0} with targetNames length.",
gltfMesh.primitives[i]));
Debug.LogWarning($"invalid primitive.extras.targetNames length");
break;
}
}
for (var i = 0; i < targetNames.Count; i++)
{
BlendShapes[i].Name = targetNames[i];
}
}
@@ -449,7 +446,9 @@ namespace UniGLTF
Truncate(m_uv2, maxIndex);
Truncate(m_colors, maxIndex);
Truncate(m_boneWeights, maxIndex);
#if false
Truncate(m_tangents, maxIndex);
#endif
foreach (var blendshape in m_blendShapes)
{
Truncate(blendshape.Positions, maxIndex);