From 94b0d1eb70797dda0608105664d92d89fab53d86 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 1 Sep 2020 11:55:13 +0900 Subject: [PATCH 1/3] fix update trigger --- Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs b/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs index 950fdde62..f5fb27905 100644 --- a/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs +++ b/Assets/VRM/UniVRM/Editor/Format/VRMExporterWizard.cs @@ -516,8 +516,6 @@ namespace VRM } GUILayout.EndVertical(); } - if (modified) - InvokeWizardUpdate(); GUILayout.Space(8); } @@ -723,4 +721,3 @@ namespace VRM } } } - From cd158ec430ac48075da98838d42ba88708e58b70 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 1 Sep 2020 11:57:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?VRMFirstPerson.Validate=20=E3=81=AE?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AB=20prefix?= =?UTF-8?q?=20=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82out=20of=20hierarchy?= =?UTF-8?q?=E3=80=80=E3=81=A8=20not=20active=20=E3=81=AE=E5=8C=BA=E5=88=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs b/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs index 11b59375c..480032843 100644 --- a/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs +++ b/Assets/VRM/UniVRM/Scripts/FirstPerson/VRMFirstPerson.cs @@ -52,18 +52,22 @@ namespace VRM public IEnumerable Validate() { - var hierarchy = GetComponentsInChildren(); + var hierarchy = GetComponentsInChildren(true); for (int i = 0; i < Renderers.Count; ++i) { var r = Renderers[i]; if (r.Renderer == null) { - yield return Validation.Error($"{name}.Renderers[{i}].Renderer is null"); + yield return Validation.Error($"[VRMFirstPerson]{name}.Renderers[{i}].Renderer is null"); } if (!hierarchy.Contains(r.Renderer.transform)) { - yield return Validation.Error($"{name}.Renderers[{i}].Renderer is out of hierarchy"); + yield return Validation.Error($"[VRMFirstPerson]{name}.Renderers[{i}].Renderer is out of hierarchy"); + } + if (!r.Renderer.gameObject.activeInHierarchy) + { + yield return Validation.Error($"[VRMFirstPerson]{name}.Renderers[{i}].Renderer is not active"); } } yield break; From 62b3983ef4473f739158ac167298e58b805a90c7 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 1 Sep 2020 12:00:11 +0900 Subject: [PATCH 3/3] =?UTF-8?q?springbone=20validation.=20messsage=20?= =?UTF-8?q?=E3=81=AB=20prefix=20[VRMSpringBone]=20=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=82`out=20of=20hierarchy`=20=E3=81=A8=20`not=20active`=20?= =?UTF-8?q?=E3=82=92=E5=8C=BA=E5=88=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/SpringBone/VRMSpringBoneValidator.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/VRM/UniVRM/Editor/SpringBone/VRMSpringBoneValidator.cs b/Assets/VRM/UniVRM/Editor/SpringBone/VRMSpringBoneValidator.cs index e552b5696..d0e9beae2 100644 --- a/Assets/VRM/UniVRM/Editor/SpringBone/VRMSpringBoneValidator.cs +++ b/Assets/VRM/UniVRM/Editor/SpringBone/VRMSpringBoneValidator.cs @@ -14,7 +14,7 @@ namespace VRM yield break; } - var hierarchy = root.GetComponentsInChildren(); + var hierarchy = root.GetComponentsInChildren(true); Dictionary> rootMap = new Dictionary>(); @@ -25,12 +25,17 @@ namespace VRM var springRoot = sb.RootBones[i]; if (springRoot == null) { - yield return Validation.Error($"{sb.name}.RootBones[{i}] is null"); + yield return Validation.Error($"[VRMSpringBone]{sb.name}.RootBones[{i}] is null"); continue; } if (!hierarchy.Contains(springRoot)) { - yield return Validation.Error($"{sb.name}.RootBones[{i}] is out of hierarchy"); + yield return Validation.Error($"[VRMSpringBone]{sb.name}.RootBones[{i}] is out of hierarchy"); + continue; + } + if (!springRoot.gameObject.activeInHierarchy) + { + yield return Validation.Error($"[VRMSpringBone]{sb.name}.RootBones[{i}] is not active"); continue; }