From c0ea7f7e7e5085079a7c9952015d621f7d734a46 Mon Sep 17 00:00:00 2001
From: bd_ <bdunderscore@fushizen.net>
Date: Sat, 15 Oct 2022 14:36:54 -0700
Subject: [PATCH] Fix NPE when inspecting BoneProxy outside of an avatar

---
 .../Editor/Inspector/BoneProxyEditor.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs b/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
index 876fe1a4..bca84b35 100644
--- a/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
+++ b/Packages/net.fushizen.modular-avatar/Editor/Inspector/BoneProxyEditor.cs
@@ -34,7 +34,7 @@ namespace net.fushizen.modular_avatar.core.editor
                 var t = (ModularAvatarBoneProxy) targets[i];
                 var av = RuntimeUtil.FindAvatarInParents(t.transform);
 
-                if (parentAvatar == null) parentAvatar = av.gameObject;
+                if (av != null && parentAvatar == null) parentAvatar = av.gameObject;
                 if (av == null || parentAvatar != av.gameObject)
                 {
                     base.OnInspectorGUI();