Fix viseme blendshapes and eyelid blendshapes sometimes not getting r…

…eassigned correctly if they aren't on a mesh named `Body`.
d4rkc0d3r · Aug 2, 2024 · decba43 · decba43
1 parent 20a7423
commit decba43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v3.7.4
+### Bug Fixes
+* Fix viseme blendshapes and eyelid blendshapes sometimes not getting reassigned correctly if they aren't on a mesh named `Body`.
+
 ## v3.7.3
 ### Bug Fixes
 * Fix the hardcoded `_VirtualLens_Root` exclusion not working for the `Delete Unused GameObjects` option.

diff --git a/Editor/d4rkAvatarOptimizer.cs b/Editor/d4rkAvatarOptimizer.cs
@@ -4557,9 +4557,9 @@ int GetNewBoneIndex(int oldIndex)
                 {
                     if (ids[i] < 0)
                         continue;
-                    for (int meshID = 0; meshID < combinableSkinnedMeshes.Count; meshID++)
+                    for (int meshID = 0; meshID < basicMergedMeshesList.Count; meshID++)
                     {
-                        if (combinableSkinnedMeshes[meshID] == eyeLookMeshRenderer)
+                        if (basicMergedMeshesList[meshID] == eyeLookMeshRenderer)
                         {
                             avDescriptor.customEyeLookSettings.eyelidsSkinnedMesh = meshRenderer;
                             ids[i] = combinedMesh.GetBlendShapeIndex(blendShapeMeshIDtoNewName[(meshID, ids[i])]);
@@ -4569,9 +4569,9 @@ int GetNewBoneIndex(int oldIndex)
                 avDescriptor.customEyeLookSettings.eyelidsBlendshapes = ids;
             }
 
-            for (int meshID = 0; meshID < combinableSkinnedMeshes.Count; meshID++)
+            for (int meshID = 0; meshID < basicMergedMeshesList.Count; meshID++)
             {
-                var oldVisemeMesh = combinableSkinnedMeshes[meshID];
+                var oldVisemeMesh = basicMergedMeshesList[meshID];
                 if (avDescriptor.VisemeSkinnedMesh == oldVisemeMesh)
                 {
                     avDescriptor.VisemeSkinnedMesh = meshRenderer;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "d4rkpl4y3r.d4rkavataroptimizer",
   "displayName": "d4rkAvatarOptimizer",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "unity": "2019.4",
   "description": "An optimizer aiming to reduce mesh & material count and more of VRChat 3.0 avatars.",
   "dependencies": {},