hack: more null check AvatarDescriptors

bdunderscore · Mar 3, 2024 · 4e7afe3 · 4e7afe3
1 parent fcbf64c
commit 4e7afe3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/Editor/FixupPasses/FixupExpressionsMenuPass.cs b/Editor/FixupPasses/FixupExpressionsMenuPass.cs
@@ -19,6 +19,8 @@ internal class FixupExpressionsMenuPass
 
         internal static void FixupExpressionsMenu(BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             context.AvatarDescriptor.customExpressions = true;
 
             var expressionsMenu = context.AvatarDescriptor.expressionsMenu;

diff --git a/Editor/MergeAnimatorProcessor.cs b/Editor/MergeAnimatorProcessor.cs
@@ -65,6 +65,7 @@ internal void OnPreprocessAvatar(GameObject avatarGameObject, BuildContext conte
             mergeSessions.Clear();
 
             var descriptor = avatarGameObject.GetComponent<VRCAvatarDescriptor>();
+            if (!descriptor) return;
 
             if (descriptor.baseAnimationLayers != null) InitSessions(descriptor.baseAnimationLayers);
             if (descriptor.specialAnimationLayers != null) InitSessions(descriptor.specialAnimationLayers);

diff --git a/Editor/OptimizationPasses/PruneParametersPass.cs b/Editor/OptimizationPasses/PruneParametersPass.cs
@@ -9,6 +9,8 @@ internal class PruneParametersPass : Pass<PruneParametersPass>
     {
         protected override void Execute(ndmf.BuildContext context)
         {
+            if (!context.AvatarDescriptor) return;
+
             var expParams = context.AvatarDescriptor.expressionParameters;
             if (expParams != null && context.IsTemporaryAsset(expParams))
             {

diff --git a/Editor/RenameParametersHook.cs b/Editor/RenameParametersHook.cs
@@ -144,6 +144,8 @@ private void SetExpressionParameters(GameObject avatarRoot, ImmutableDictionary<
                 .ToImmutableDictionary();
 
             var avatar = avatarRoot.GetComponent<VRCAvatarDescriptor>();
+            if (!avatar) return;
+
             var expParams = avatar.expressionParameters;
 
             if (expParams == null)