Merge pull request #1202 from anatawa12/visame-skinned-mesh-disabled

fix: Avatars with Visame Skinned Mesh disabled will not able to upload
anatawa12 · Sep 23, 2024 · 82fc5f7 · 82fc5f7
2 parents 17e2308 + 8444fbe
commit 82fc5f7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Null Reference Exception with newly created VRCAnimatorPlayAudio `#1199`
 - Particle System that uses local scale will be broken `#1197`
+- Avatars with Visame Skinned Mesh disabled will not able to upload `#1202`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Null Reference Exception with newly created VRCAnimatorPlayAudio `#1199`
 - Particle System that uses local scale will be broken `#1197`
+- Avatars with Visame Skinned Mesh disabled will not able to upload `#1202`
 
 ### Security
 

diff --git a/Editor/APIInternal/ComponentInfos.VRCSDK.cs b/Editor/APIInternal/ComponentInfos.VRCSDK.cs
@@ -139,18 +139,29 @@ protected override void ApplySpecialMapping(T component, MappingSource mappingSo
                 case VRC_AvatarDescriptor.LipSyncStyle.VisemeBlendShape:
                 {
                     var info = mappingSource.GetMappedComponent(component.VisemeSkinnedMesh);
-                    component.VisemeSkinnedMesh = info.MappedComponent;
-                    var removed = false;
-                    foreach (ref var shapeName in component.VisemeBlendShapes.AsSpan())
+
+                    if (info.MappedComponent == null)
                     {
-                        if (info.TryMapProperty($"blendShape.{shapeName}", out var mapped)
-                            && mapped.Component == info.MappedComponent)
-                            shapeName = ParseBlendShapeProperty(mapped.Property);
-                        else
-                            removed = true;
+                        component.VisemeSkinnedMesh = null;
+                        component.lipSync = VRC_AvatarDescriptor.LipSyncStyle.VisemeParameterOnly;
+                    }
+                    else
+                    {
+                        component.VisemeSkinnedMesh = info.MappedComponent;
+                        var removed = false;
+                        foreach (ref var shapeName in component.VisemeBlendShapes.AsSpan())
+                        {
+                            if (info.TryMapProperty($"blendShape.{shapeName}", out var mapped)
+                                && mapped.Component == info.MappedComponent)
+                                shapeName = ParseBlendShapeProperty(mapped.Property);
+                            else
+                                removed = true;
+                        }
+
+                        if (removed)
+                            BuildLog.LogError("ApplyObjectMapping:VRCAvatarDescriptor:viseme BlendShape Removed");
                     }
-                    if (removed)
-                        BuildLog.LogError("ApplyObjectMapping:VRCAvatarDescriptor:viseme BlendShape Removed");
+
                     break;
                 }
                 case VRC_AvatarDescriptor.LipSyncStyle.VisemeParameterOnly:
@@ -290,19 +301,28 @@ protected override void ApplySpecialMapping(VRCAvatarDescriptor component, Mappi
                     case VRCAvatarDescriptor.EyelidType.Blendshapes:
                     {
                         var info = mappingSource.GetMappedComponent(component.customEyeLookSettings.eyelidsSkinnedMesh);
-                        component.customEyeLookSettings.eyelidsSkinnedMesh = info.MappedComponent;
-                        var removed = false;
-                        foreach (ref var eyelidsBlendshape in component.customEyeLookSettings.eyelidsBlendshapes.AsSpan())
+                        if (info.MappedComponent == null)
                         {
-                            if (info.TryMapProperty(VProp.BlendShapeIndex(eyelidsBlendshape), out var mapped)
-                                && mapped.Component == info.MappedComponent)
-                                eyelidsBlendshape = VProp.ParseBlendShapeIndex(mapped.Property);
-                            else
-                                removed = true;
+                            component.customEyeLookSettings.eyelidsSkinnedMesh = null;
+                            component.customEyeLookSettings.eyelidType = VRCAvatarDescriptor.EyelidType.None;
+                        }
+                        else
+                        {
+                            component.customEyeLookSettings.eyelidsSkinnedMesh = info.MappedComponent;
+                            var removed = false;
+                            foreach (ref var eyelidsBlendshape in component.customEyeLookSettings.eyelidsBlendshapes
+                                         .AsSpan())
+                            {
+                                if (info.TryMapProperty(VProp.BlendShapeIndex(eyelidsBlendshape), out var mapped)
+                                    && mapped.Component == info.MappedComponent)
+                                    eyelidsBlendshape = VProp.ParseBlendShapeIndex(mapped.Property);
+                                else
+                                    removed = true;
+                            }
+
+                            if (removed)
+                                BuildLog.LogError("ApplyObjectMapping:VRCAvatarDescriptor:eyelids BlendShape Removed");
                         }
-
-                        if (removed)
-                            BuildLog.LogError("ApplyObjectMapping:VRCAvatarDescriptor:eyelids BlendShape Removed");
                     }
                         break;
                     default: