From 43fdadcc2b00a6a303273c058be300240ecf0a8d Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Mon, 24 Aug 2020 15:20:52 -0700 Subject: [PATCH] Only register to OnOceanRendererEnabled if no instance --- .../Shared/Scripts/UnderwaterEnvironmentalLighting.cs | 5 ++--- .../Crest/Crest/Scripts/Reflection/OceanPlanarReflection.cs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/Shared/Scripts/UnderwaterEnvironmentalLighting.cs b/crest/Assets/Crest/Crest-Examples/Shared/Scripts/UnderwaterEnvironmentalLighting.cs index 5f5ef9c3e..875e80427 100644 --- a/crest/Assets/Crest/Crest-Examples/Shared/Scripts/UnderwaterEnvironmentalLighting.cs +++ b/crest/Assets/Crest/Crest-Examples/Shared/Scripts/UnderwaterEnvironmentalLighting.cs @@ -29,11 +29,10 @@ public class UnderwaterEnvironmentalLighting : MonoBehaviour void OnEnable() { - OceanRenderer.OnOceanRendererEnabled -= OnOceanRendererEnabled; - OceanRenderer.OnOceanRendererEnabled += OnOceanRendererEnabled; - if (OceanRenderer.Instance == null) { + OceanRenderer.OnOceanRendererEnabled -= OnOceanRendererEnabled; + OceanRenderer.OnOceanRendererEnabled += OnOceanRendererEnabled; enabled = false; return; } diff --git a/crest/Assets/Crest/Crest/Scripts/Reflection/OceanPlanarReflection.cs b/crest/Assets/Crest/Crest/Scripts/Reflection/OceanPlanarReflection.cs index 5cf8c36fe..d3cc9966a 100644 --- a/crest/Assets/Crest/Crest/Scripts/Reflection/OceanPlanarReflection.cs +++ b/crest/Assets/Crest/Crest/Scripts/Reflection/OceanPlanarReflection.cs @@ -119,11 +119,10 @@ public class OceanPlanarReflection : MonoBehaviour private void OnEnable() { - OceanRenderer.OnOceanRendererEnabled -= OnOceanRendererEnabled; - OceanRenderer.OnOceanRendererEnabled += OnOceanRendererEnabled; - if (OceanRenderer.Instance == null) { + OceanRenderer.OnOceanRendererEnabled -= OnOceanRendererEnabled; + OceanRenderer.OnOceanRendererEnabled += OnOceanRendererEnabled; enabled = false; return; }