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

Author: keijiro

PostProcessing/Resources/Shaders/Uber.shader

@@ -22,8 +22,7 @@ Shader "Hidden/Post FX/Uber Shader"
         #pragma multi_compile __ EYE_ADAPTATION
         #pragma multi_compile __ CHROMATIC_ABERRATION
         #pragma multi_compile __ DEPTH_OF_FIELD DEPTH_OF_FIELD_COC_VIEW
-        #pragma multi_compile __ BLOOM
-        #pragma multi_compile __ BLOOM_LENS_DIRT
+        #pragma multi_compile __ BLOOM BLOOM_LENS_DIRT
         #pragma multi_compile __ COLOR_GRADING COLOR_GRADING_LOG_VIEW
         #pragma multi_compile __ USER_LUT
         #pragma multi_compile __ GRAIN
@@ -218,7 +217,7 @@ Shader "Hidden/Post FX/Uber Shader"
             #endif
 
             // HDR Bloom
-            #if BLOOM
+            #if BLOOM || BLOOM_LENS_DIRT
             {
                 half3 bloom = UpsampleFilter(_BloomTex, i.uvFlippedSPR, _BloomTex_TexelSize.xy, _Bloom_Settings.x) * _Bloom_Settings.y;
                 color += bloom;

PostProcessing/Runtime/Components/BloomComponent.cs

@@ -129,7 +129,6 @@ public void Prepare(RenderTexture source, Material uberMaterial, Texture autoExp
             context.renderTextureFactory.Release(prefiltered);
 
             // Push everything to the uber material
-            uberMaterial.EnableKeyword("BLOOM");
             uberMaterial.SetTexture(Uniforms._BloomTex, bloomTex);
             uberMaterial.SetVector(Uniforms._Bloom_Settings, new Vector2(sampleScale, bloom.intensity));
 
@@ -139,6 +138,10 @@ public void Prepare(RenderTexture source, Material uberMaterial, Texture autoExp
                 uberMaterial.SetFloat(Uniforms._Bloom_DirtIntensity, lensDirt.intensity);
                 uberMaterial.EnableKeyword("BLOOM_LENS_DIRT");
             }
+            else
+            {
+                uberMaterial.EnableKeyword("BLOOM");
+            }
         }
     }
 }

PostProcessing/Runtime/PostProcessingBehaviour.cs

@@ -17,7 +17,6 @@ public class PostProcessingBehaviour : MonoBehaviour
         public PostProcessingProfile profile;
 
         public Func<Vector2, Matrix4x4> jitteredMatrixFunc;
-        Matrix4x4 nonJitteredProjectionMatrix;
 
         // Internal helpers
         Dictionary<Type, KeyValuePair<CameraEvent, CommandBuffer>> m_CommandBuffers;
@@ -155,10 +154,7 @@ void OnPreCull()
 
             // Temporal antialiasing jittering, needs to happen before culling
             if (!m_RenderingInSceneView && m_Taa.active && !profile.debugViews.willInterrupt)
-            {
-                nonJitteredProjectionMatrix = m_Context.camera.projectionMatrix;
                 m_Taa.SetProjectionMatrix(jitteredMatrixFunc);
-            }
         }
 
         void OnPreRender()
@@ -182,7 +178,7 @@ void OnPostRender()
                 return;
 
             if (!m_RenderingInSceneView && m_Taa.active && !profile.debugViews.willInterrupt)
-                m_Context.camera.projectionMatrix = nonJitteredProjectionMatrix;
+                m_Context.camera.ResetProjectionMatrix();
         }
 
         // Classic render target pipeline for RT-based effects

README.md

@@ -1,4 +1,4 @@
-# Post-processing Stack (beta)
+# Post-processing Stack
 
 Need help ? Check out the [quick start guide](https://github.com/Unity-Technologies/PostProcessing/wiki) and [the official forums](https://forum.unity3d.com/forums/image-effects.96/) !