From 92af578211537d919d9064b4b5ab588be9b3b078 Mon Sep 17 00:00:00 2001 From: raiti-chan Date: Sun, 18 Dec 2022 22:24:00 +0900 Subject: [PATCH] fix merge miss --- .../nadena.dev.modular-avatar/Editor/AvatarProcessor.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs index 103a8911..641f760f 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs @@ -176,11 +176,10 @@ namespace nadena.dev.modular_avatar.core.editor ClonedMenuMappings.Clear(); } - var activator = avatarGameObject.GetComponent(); - if (activator != null) - { - UnityEngine.Object.DestroyImmediate(activator); - } + var activator = avatarGameObject.GetComponent(); + if (activator != null) + { + UnityEngine.Object.DestroyImmediate(activator); } }