2018.2 compatibility and safety measures

Author: Chman

PostProcessing/Runtime/ParameterOverride.cs

@@ -15,6 +15,20 @@ public T GetValue<T>()
             return ((ParameterOverride<T>)this).value;
         }
 
+        // This is used in case you need to access fields/properties that can't be accessed in the
+        // constructor of a ScriptableObject (ParameterOverride are generally declared and inited in
+        // a PostProcessEffectSettings which is a ScriptableObject). This will be called right
+        // after the settings object has been constructed, thus allowing previously "forbidden"
+        // fields/properties.
+        protected internal virtual void OnEnable()
+        {
+        }
+
+        // Here for consistency reasons (cf. OnEnable)
+        protected internal virtual void OnDisable()
+        {
+        }
+
         internal abstract void SetValue(ParameterOverride parameter);
     }
 
@@ -166,9 +180,22 @@ public override void Interp(Vector4 from, Vector4 to, float t)
     [Serializable]
     public sealed class SplineParameter : ParameterOverride<Spline>
     {
+        protected internal override void OnEnable()
+        {
+            if (value != null)
+                value.Cache(int.MinValue);
+        }
+
         public override void Interp(Spline from, Spline to, float t)
         {
             int frameCount = Time.renderedFrameCount;
+
+            if (from == null || to == null)
+            {
+                base.Interp(from, to, t);
+                return;
+            }
+
             from.Cache(frameCount);
             to.Cache(frameCount);
 

PostProcessing/Runtime/PostProcessEffectSettings.cs

@@ -28,6 +28,18 @@ void OnEnable()
                 .Select(t => (ParameterOverride)t.GetValue(this))
                 .ToList()
                 .AsReadOnly();
+
+            foreach (var parameter in parameters)
+                parameter.OnEnable();
+        }
+
+        void OnDisable()
+        {
+            if (parameters == null)
+                return;
+
+            foreach (var parameter in parameters)
+                parameter.OnDisable();
         }
 
         public void SetAllOverridesTo(bool state, bool excludeEnabled = true)

PostProcessing/Runtime/Utils/Spline.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEngine.Assertions;
 
 namespace UnityEngine.Rendering.PostProcessing
 {
@@ -31,15 +32,15 @@ public sealed class Spline
 
         public Spline(AnimationCurve curve, float zeroValue, bool loop, Vector2 bounds)
         {
+            Assert.IsNotNull(curve);
             this.curve = curve;
             m_ZeroValue = zeroValue;
             m_Loop = loop;
             m_Range = bounds.magnitude;
             cachedData = new float[k_Precision];
-            Cache(0, true);
         }
 
-        public void Cache(int frame, bool skipFrameCountTest = false)
+        public void Cache(int frame)
         {
             // Only cache once per frame
             if (frame == frameCount)
@@ -64,8 +65,7 @@ public void Cache(int frame, bool skipFrameCountTest = false)
             for (int i = 0; i < k_Precision; i++)
                 cachedData[i] = Evaluate((float)i * k_Step);
 
-            if (!skipFrameCountTest)
-                frameCount = Time.renderedFrameCount;
+            frameCount = Time.renderedFrameCount;
         }
 
         public float Evaluate(float t)