Merge remote-tracking branch 'remotes/upstream/v2' into v2

# Conflicts:
#	PostProcessing/Shaders/Builtins/ScreenSpaceReflections.hlsl

Added .gitattributes from ypapouin@cc0a269
Added pull request Unity-Technologies#854

Author: Pierre GAC

.gitattributes

@@ -0,0 +1,16 @@
+## Unity ##
+
+*.cs diff=csharp text eol=crlf
+*.cginc text
+*.shader text
+
+
+*.mat merge=unityyamlmerge eol=lf
+*.anim merge=unityyamlmerge eol=lf
+*.unity merge=unityyamlmerge eol=lf
+*.prefab merge=unityyamlmerge eol=lf
+*.physicsMaterial2D merge=unityyamlmerge eol=lf
+*.physicsMaterial merge=unityyamlmerge eol=lf
+*.asset merge=unityyamlmerge eol=lf
+*.meta merge=unityyamlmerge eol=lf
+*.controller merge=unityyamlmerge eol=lf

CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## [2.1.9] - 2019-XX-XX
+
+### Fixed
+- Shader compilation error on PS4 with Unity 2019.3.
+
 ## [2.1.8] - 2019-10-11
 
 ### Added

PostProcessing/Runtime/PostProcessLayer.cs

@@ -424,6 +424,7 @@ void OnPreCull()
 #if UNITY_2018_2_OR_NEWER
             if (!m_Camera.usePhysicalProperties)
 #endif
+            if (m_CurrentContext.IsTemporalAntialiasingActive())
                 m_Camera.ResetProjectionMatrix();
             m_Camera.nonJitteredProjectionMatrix = m_Camera.projectionMatrix;
 

PostProcessing/Shaders/Builtins/ScreenSpaceReflections.hlsl

@@ -370,7 +370,7 @@ float4 FragComposite(VaryingsDefault i) : SV_Target
 	float4 gbuffer1 = _CameraGBufferTexture1.Load(int3(i.vertex.xy, 0));
 	float4 gbuffer2 = _CameraGBufferTexture2.Load(int3(i.vertex.xy, 0));
 
-	float oneMinusReflectivity = 0.0;
+	half oneMinusReflectivity = 0.0;
 	EnergyConservationBetweenDiffuseAndSpecular(gbuffer0.rgb, gbuffer1.rgb, oneMinusReflectivity);
 
 	float3 normal = 2.0 * gbuffer2.rgb - 1.0;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.unity.postprocessing",
-    "version": "2.1.8",
+    "version": "2.1.9",
     "displayName": "Post Processing",
     "unity": "2018.1",
     "description": "The post-processing stack (v2) comes with a collection of effects and image filters you can apply to your cameras to improve the visuals of your games.",