Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master'

Author: keijiro

PostProcessing/Resources/Shaders/ACES.cginc

@@ -620,13 +620,13 @@ half3 Y_2_linCV(half3 Y, half Ymax, half Ymin)
 
 half3 XYZ_2_xyY(half3 XYZ)
 {
-    half divisor = max(dot(XYZ, (1.0).xxx), 1e-10);
+    half divisor = max(dot(XYZ, (1.0).xxx), 1e-4);
     return half3(XYZ.xy / divisor, XYZ.y);
 }
 
 half3 xyY_2_XYZ(half3 xyY)
 {
-    half m = xyY.z / max(xyY.y, 1e-10);
+    half m = xyY.z / max(xyY.y, 1e-4);
     half3 XYZ = half3(xyY.xz, (1.0 - xyY.x - xyY.y));
     XYZ.xz *= m;
     return XYZ;

PostProcessing/Runtime/PostProcessingBehaviour.cs

@@ -76,6 +76,8 @@ void OnEnable()
 
             foreach (var component in m_Components)
                 m_ComponentStates.Add(component, false);
+
+            useGUILayout = false;
         }
 
         void OnPreCull()

PostProcessing/Runtime/PostProcessingContext.cs

@@ -33,7 +33,12 @@ public bool isGBufferAvailable
 
         public bool isHdr
         {
+            // No UNITY_5_6_OR_NEWER defined in early betas of 5.6
+#if UNITY_5_6 || UNITY_5_6_OR_NEWER
+            get { return camera.allowHDR; }
+#else
             get { return camera.hdr; }
+#endif
         }
 
         public int width