From e58de0d55b907ede824ca42943827d226030e3ac Mon Sep 17 00:00:00 2001 From: j-hirose Date: Mon, 3 Jun 2019 18:02:19 +0900 Subject: [PATCH] fix task UNITY_WEBGL --- Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs | 2 +- Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs b/Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs index d4eb1f70d..35c1d3513 100644 --- a/Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs +++ b/Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs @@ -26,7 +26,7 @@ namespace VRM.Samples [SerializeField, Header("runtime")] VRMFirstPerson m_firstPerson; -#if (NET_4_6 && UNITY_2017_1_OR_NEWER) +#if (NET_4_6 && UNITY_2017_1_OR_NEWER && !UNITY_WEBGL) VRMBlendShapeProxy m_blendShape; void SetupTarget() diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs index e3949bced..863da42cf 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs @@ -82,7 +82,7 @@ namespace VRM } #endregion -#if ((NET_4_6 || NET_STANDARD_2_0) && UNITY_2017_1_OR_NEWER) +#if ((NET_4_6 || NET_STANDARD_2_0) && UNITY_2017_1_OR_NEWER && !UNITY_WEBGL) [Obsolete("use VRMImporterContext.LoadAsync()")] public static Task LoadVrmAsync(string path, bool show = true)