Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-24 15:08:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #256 from hiroj/exclude_loadasynctask_with_webgl

Browse Source 
exclude loadasynctask with webgl
This commit is contained in:
ousttrue 2019-06-03 18:18:43 +09:00 committed by GitHub
commit f2bec289dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM.Samples/Scripts/VRMRuntimeLoaderNet4.cs
View File

@ -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()

2
Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
View File

@ -480,7 +480,7 @@ namespace UniGLTF
);
}
#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)
public async Task<GameObject> LoadAsyncTask()
{
await LoadAsync().ToTask();

2
Assets/VRM/UniVRM/Scripts/Format/VRMImporter.cs
View File

@ -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<GameObject> LoadVrmAsync(string path, bool show = true)