From c634e319a9f9abd394c99b0ab5656ce4e5e2f597 Mon Sep 17 00:00:00 2001 From: faidra Date: Thu, 10 Sep 2020 20:59:58 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A6=AA=E3=82=92=E3=81=9F=E3=81=A9=E3=82=8B?= =?UTF-8?q?=E6=99=82=E3=80=81=E9=9D=9E=E3=82=A2=E3=82=AF=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=96=E3=81=AATransform=E3=82=82=E5=8F=96=E5=BE=97=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E6=96=B9=E6=B3=95=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/UniVRM/Editor/ExporterExtensions.cs | 3 ++- Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/VRM/UniVRM/Editor/ExporterExtensions.cs b/Assets/VRM/UniVRM/Editor/ExporterExtensions.cs index 6416636bd..86c7445f0 100644 --- a/Assets/VRM/UniVRM/Editor/ExporterExtensions.cs +++ b/Assets/VRM/UniVRM/Editor/ExporterExtensions.cs @@ -1,4 +1,5 @@ using System.Linq; +using MeshUtility; using UnityEngine; namespace VRM @@ -7,7 +8,7 @@ namespace VRM { public static bool EnableForExport(this Component mono) { - if (mono.transform.GetComponentsInParent().Any(x => !x.gameObject.activeSelf)) + if (mono.transform.Ancestors().Any(x => !x.gameObject.activeSelf)) { // 自分か祖先に !activeSelf がいる return false; diff --git a/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs b/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs index b69fcc1b2..509c974db 100644 --- a/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs +++ b/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs @@ -195,7 +195,7 @@ namespace VRM var eraseBones = bones.Select((x, i) => { // 祖先に削除対象が存在するか - bool erase = x.GetComponentsInParent().Any(y => y == eraseRoot); + bool erase = x.Ancestors().Any(y => y == eraseRoot); return new { i,