Merge branch 'v2' into load-store-actions

Author: hkr

.npmignore

@@ -8,4 +8,5 @@ Documentation/ApiDocs/**
 issue_template.md
 issue_template.md.meta
 QAReport.md
-QAReport.md.meta
+QAReport.md.meta
+/POSTFXMARKER*

CHANGELOG.md

@@ -4,8 +4,15 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [0.1.8] - 2017-MM-DD
+## [2.0.3-preview] - 2018-03-13
 
-### This is the first release of *PostProcessing*.
+### Fixed
+- Disabled debug compute shaders on OpenGL ES3 to avoid crashes on a lot of Android devices.
+- NullReferenceException while mixing volumes and global volumes. ([498](https://github.com/Unity-Technologies/PostProcessing/issues/498))
 
-*Short description of this release*
+### Changed
+- Improved performances when blending between identical textures.
+
+## [2.0.2-preview] - 2018-03-07
+
+This is the first release of *PostProcessing*.

Documentation/Post-ProcessingManual.md

@@ -32,6 +32,7 @@ public sealed class ColorGradingEditor : PostProcessEffectEditor<ColorGrading>
         SerializedParameterOverride m_ToneCurveGamma;
 
         SerializedParameterOverride m_LdrLut;
+        SerializedParameterOverride m_LdrLutContribution;
 
         SerializedParameterOverride m_Temperature;
         SerializedParameterOverride m_Tint;
@@ -108,6 +109,7 @@ public override void OnEnable()
             m_ToneCurveGamma = FindParameterOverride(x => x.toneCurveGamma);
 
             m_LdrLut = FindParameterOverride(x => x.ldrLut);
+            m_LdrLutContribution = FindParameterOverride(x => x.ldrLutContribution);
 
             m_Temperature = FindParameterOverride(x => x.temperature);
             m_Tint = FindParameterOverride(x => x.tint);
@@ -241,6 +243,7 @@ void DoStandardModeGUI(bool hdr)
             if (!hdr)
             {
                 PropertyField(m_LdrLut);
+                PropertyField(m_LdrLutContribution);
 
                 var lut = (target as ColorGrading).ldrLut.value;
                 CheckLutImportSettings(lut);

Documentation/Quickstart.md

@@ -0,0 +1,16 @@
+using UnityEngine.Rendering.PostProcessing;
+
+namespace UnityEditor.Rendering.PostProcessing
+{
+    [PostProcessEditor(typeof(LensDistortion))]
+    public sealed class LensDistortionEditor : DefaultPostProcessEffectEditor
+    {
+        public override void OnInspectorGUI()
+        {
+            if (RuntimeUtilities.isVREnabled)
+                EditorGUILayout.HelpBox("Lens Distortion is automatically disabled when VR is enabled.", MessageType.Warning);
+
+            base.OnInspectorGUI();
+        }
+    }
+}