Fix crashes

imagitama · Jul 28, 2022 · 1005698 · 1005698
1 parent 3ac5807
commit 1005698
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.2
+
+- fix crashes
+
 # 1.0.1
 
 - ignore no visemes detected

diff --git a/Editor/VRC3CVR.cs b/Editor/VRC3CVR.cs
@@ -843,7 +843,7 @@ void GetValuesFromVrcAvatar()
 
         if (vrcVisemeBlendShapes.Length == 0)
         {
-            Debug.Warning("Found 0 blend shapes from VRC component!");
+            Debug.Log("Found 0 blend shapes from VRC component!");
         }
 
         Debug.Log("Visemes: " + string.Join(", ", vrcVisemeBlendShapes));
@@ -853,10 +853,13 @@ void GetValuesFromVrcAvatar()
         if (eyelidsBlendshapes.Length >= 1 && eyelidsBlendshapes[0] != -1) {
             int blinkBlendshapeIdx = eyelidsBlendshapes[0];
             Mesh mesh = bodySkinnedMeshRenderer.sharedMesh;
-
-            blinkBlendshapeName = mesh.GetBlendShapeName(blinkBlendshapeIdx);
-
-            Debug.Log("Blink blendshape: " + blinkBlendshapeName);
+
+            if (blinkBlendshapeIdx > mesh.blendShapeCount) {
+                Debug.Log("Could not use eyelid blendshape at index " + blinkBlendshapeIdx.ToString() + ": does not exist in mesh!");
+            } else {
+                blinkBlendshapeName = mesh.GetBlendShapeName(blinkBlendshapeIdx);
+                Debug.Log("Blink blendshape: " + blinkBlendshapeName);
+            }
         } else {
             Debug.Log("No blink blendshape set, ignoring...");
         }