Merge branch 'master' into 1.5

2022-11-22 19:58:53 +01:00
parent eeff5ea3ae 2e46ebea7a
commit 2ad6eb0c72
40 changed files with 400 additions and 206 deletions
--- a/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp
+++ b/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.cpp
@@ -113,6 +113,11 @@ bool ShaderAssetBase::Save()

 bool IsValidShaderCache(DataContainer<byte>& shaderCache, Array<String>& includes)
 {
+    if (shaderCache.Length() == 0)
+    {
+        return false;
+    }
+
    MemoryReadStream stream(shaderCache.Get(), shaderCache.Length());

    // Read cache format version