Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_batcher

arnaudcarre · arnaudcarre · commit 24db096de548 · 2017-04-24T17:26:44.000+02:00
diff --git a/Assets/ScriptableRenderPipeline/common/TextureCache.cs b/Assets/ScriptableRenderPipeline/common/TextureCache.cs
@@ -286,14 +286,18 @@ private struct SSliceEntry
 
         public int FetchSlice(Texture texture)
         {
+            var sliceIndex = -1;
+
+            if (texture == null)
+                return sliceIndex;
+
             var texId = (uint)texture.GetInstanceID();
 
             //assert(TexID!=g_InvalidTexID);
             if (texId == g_InvalidTexID) return 0;
 
             var bSwapSlice = false;
             var bFoundAvailOrExistingSlice = false;
-            var sliceIndex = -1;
 
             // search for existing copy
             if (m_LocatorInSliceArray.ContainsKey(texId))
