From 3a9b2ba33ca62612ceb3d67ba1143a76481d3a8b Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 9 Apr 2018 14:40:18 +0900 Subject: [PATCH] fix Unity-5.6 build --- .../BlendShape/Editor/PreviewFaceRenderer.cs | 29 ++++++++++++++++--- Scripts/Format/VRMVersion.cs | 8 ++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Scripts/BlendShape/Editor/PreviewFaceRenderer.cs b/Scripts/BlendShape/Editor/PreviewFaceRenderer.cs index 0f2b6326e..d78759a20 100644 --- a/Scripts/BlendShape/Editor/PreviewFaceRenderer.cs +++ b/Scripts/BlendShape/Editor/PreviewFaceRenderer.cs @@ -30,15 +30,36 @@ namespace VRM } } + public Light[] PreviewLights + { + get + { +#if UNITY_2017_1_OR_NEWER + return m_previewUtility.lights; +#else + return m_previewUtility.m_Light; +#endif + } + } + + public void SetAmbientColor(Color color) + { +#if UNITY_2017_1_OR_NEWER + m_previewUtility.ambientColor = color; +#else + // ? +#endif + } + public PreviewFaceRenderer() { m_previewUtility = new PreviewRenderUtility(); - m_previewUtility.lights[0].intensity = 1.4f; - m_previewUtility.lights[0].transform.rotation = Quaternion.Euler(40f, 190f, 0); - m_previewUtility.lights[1].intensity = 1.4f; + PreviewLights[0].intensity = 1.4f; + PreviewLights[0].transform.rotation = Quaternion.Euler(40f, 190f, 0); + PreviewLights[1].intensity = 1.4f; - m_previewUtility.ambientColor = new Color(.1f, .1f, .1f, 0); + SetAmbientColor(new Color(.1f, .1f, .1f, 0)); } class FogScope : IDisposable diff --git a/Scripts/Format/VRMVersion.cs b/Scripts/Format/VRMVersion.cs index fa6a256ca..5a0424182 100644 --- a/Scripts/Format/VRMVersion.cs +++ b/Scripts/Format/VRMVersion.cs @@ -4,11 +4,11 @@ namespace VRM public static class VRMVersion { public const int MAJOR = 0; - public const int MINOR = 21; + public const int MINOR = 22; - public const string VERSION = "0.21"; + public const string VERSION = "0.22"; - public const string DecrementMenuName = "VRM/Version(0.21) Decrement"; - public const string IncrementMenuName = "VRM/Version(0.21) Increment"; + public const string DecrementMenuName = "VRM/Version(0.22) Decrement"; + public const string IncrementMenuName = "VRM/Version(0.22) Increment"; } }