From 3898b0a2231b919eb4f9e9b383be8b618875967f Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 14 Jul 2022 15:50:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=81=82=E3=82=8A=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs b/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs index 3c1ae1d90..84cb3a2f1 100644 --- a/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs +++ b/Assets/VRM/Editor/BlendShape/VRMBlendShapeProxyValidator.cs @@ -24,6 +24,10 @@ namespace VRM var used = new HashSet(); foreach (var c in p.BlendShapeAvatar.Clips) { + if (c == null) + { + continue; + } var key = c.Key; if (used.Contains(key)) { From ba83d65018995907d879f71ca385082493091376 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 14 Jul 2022 15:53:14 +0900 Subject: [PATCH 2/2] null check --- Assets/VRM/Runtime/IO/VRMExporter.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/VRM/Runtime/IO/VRMExporter.cs b/Assets/VRM/Runtime/IO/VRMExporter.cs index 77219d00b..1b5c06422 100644 --- a/Assets/VRM/Runtime/IO/VRMExporter.cs +++ b/Assets/VRM/Runtime/IO/VRMExporter.cs @@ -97,6 +97,10 @@ namespace VRM { foreach (var x in avatar.Clips) { + if (x == null) + { + continue; + } VRM.blendShapeMaster.Add(x, this); } }