From 2f1125e00aa1d181f018823cd9a10dcd4d06df0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez?= Date: Tue, 11 Jul 2017 23:26:38 +0100 Subject: [PATCH] Use .allowHDR instead of .hdr (deprecated) --- .../Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs | 2 +- .../Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs | 2 +- .../Standard Assets/Editor/ImageEffects/TonemappingEditor.cs | 2 +- .../Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs | 2 +- .../Effects/ImageEffects/Scripts/BloomAndFlares.cs | 2 +- .../Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs index 2966e5d..42d3803 100644 --- a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs +++ b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs @@ -77,7 +77,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as BloomAndFlares).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs index 6957591..58c9628 100644 --- a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs +++ b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs @@ -85,7 +85,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as Bloom).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/TonemappingEditor.cs b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/TonemappingEditor.cs index 613631f..f6128a4 100644 --- a/workers/unity/Assets/Standard Assets/Editor/ImageEffects/TonemappingEditor.cs +++ b/workers/unity/Assets/Standard Assets/Editor/ImageEffects/TonemappingEditor.cs @@ -42,7 +42,7 @@ public override void OnInspectorGUI () { Camera cam = (target as Tonemapping).GetComponent(); if (cam != null) { - if (!cam.hdr) { + if (!cam.allowHDR) { EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", MessageType.Warning); } else if (!(target as Tonemapping).validRenderTextureFormat) { diff --git a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs index d5fd7a6..15f39ff 100644 --- a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs +++ b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs @@ -106,7 +106,7 @@ public void OnRenderImage (RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; } diff --git a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs index 3769c21..da269f5 100644 --- a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs +++ b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs @@ -109,7 +109,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; diff --git a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs index 480ef25..508ea52 100644 --- a/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs +++ b/workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs @@ -90,7 +90,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold); if (!useDepthTexture) { - var format= GetComponent().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; + var format= GetComponent().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format); RenderTexture.active = tmpBuffer; GL.ClearWithSkybox (false, GetComponent());