Merge remote-tracking branch 'refs/remotes/origin/master' into LayeredLitShader

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

 
         public override void Render(Camera[] cameras, RenderLoop renderLoop)
         {
-            if (!m_LitRenderLoop.isInit)
+            if (m_Dirty)
-                m_LitRenderLoop.RenderInit(renderLoop);
+                Rebuild();
-            if (m_Dirty)
+            if (!m_LitRenderLoop.isInit)
-                Rebuild();
+                m_LitRenderLoop.RenderInit(renderLoop);
             }
 
             // Do anything we need to do upon a new frame.

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs

             m_StandardSkyboxMaterial = Utilities.CreateEngineMaterial("Skybox/Cubemap");
 
             m_SkyHDRIMaterial = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/SkyHDRI");
-            m_GGXConvolveMaterial = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/GGXConvolve");
+          //  m_GGXConvolveMaterial = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/GGXConvolve");
 
             m_RenderSkyPropertyBlock = new MaterialPropertyBlock();
 
         {
             Utilities.Destroy(m_StandardSkyboxMaterial);
             Utilities.Destroy(m_SkyHDRIMaterial);
-            Utilities.Destroy(m_GGXConvolveMaterial);
+        //    Utilities.Destroy(m_GGXConvolveMaterial);
             Utilities.Destroy(m_SkyboxCubemapRT);
             Utilities.Destroy(m_SkyboxGGXCubemapRT);
 
                 skyParams.rotation = 0.0f;
                 skyParams.skyHDRI = input;
                 RenderSkyToCubemap(skyParams, target, renderLoop);
-
+/*
                 // Do the convolution on remaining mipmaps
                 float invOmegaP = (6.0f * input.width * input.width) / (4.0f * Mathf.PI); // Solid angle associated to a pixel of the cubemap;
 
                         cmd.Dispose();
                     }
                 }
+ */
             }
         }
 

.collabignore

+# ===========================
+# Default Collab Ignore Rules
+# ===========================
+
+# OS Generated
+# ============
+.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+[Tt]humbs.db
+[Dd]esktop.ini
+
+# Visual Studio / MonoDevelop generated
+# =====================================
+[Ee]xported[Oo]bj/
+*.userprefs
+*.csproj
+*.pidb
+*.suo
+*.sln
+*.user
+*.unityproj
+*.booproj
+
+# Unity generated
+# ===============
+/[Tt]emp/
+[Oo]bj/
+[Bb]uild
+/[Ll]ibrary/
+sysinfo.txt
+*.stackdump