From c95e5b0611822c0497327ae5e443932c09dcef22 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 14 May 2021 10:32:55 +0200 Subject: [PATCH] Fix assets load error regression --- Source/Engine/Content/JsonAsset.cpp | 4 ++-- Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Content/JsonAsset.cpp b/Source/Engine/Content/JsonAsset.cpp index c202b6bcf..dbec5ad74 100644 --- a/Source/Engine/Content/JsonAsset.cpp +++ b/Source/Engine/Content/JsonAsset.cpp @@ -103,7 +103,7 @@ Asset::LoadResult JsonAssetBase::loadAsset() // Load data (raw json file in editor, cooked asset in build game) #if USE_EDITOR BytesContainer data; - if (File::ReadAllBytes(GetPath(), data)) + if (File::ReadAllBytes(_path, data)) { LOG(Warning, "Filed to load json asset data. {0}", ToString()); return LoadResult::CannotLoadData; @@ -114,7 +114,7 @@ Asset::LoadResult JsonAssetBase::loadAsset() } #else // Get the asset storage container but don't load it now - const auto storage = ContentStorageManager::GetStorage(GetPath(), true); + const auto storage = ContentStorageManager::GetStorage(_path, true); if (!storage) return LoadResult::CannotLoadStorage; diff --git a/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.h b/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.h index 57262eed8..a2b81bf5e 100644 --- a/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.h +++ b/Source/Engine/Graphics/Shaders/Cache/ShaderAssetBase.h @@ -135,7 +135,7 @@ protected: { AssetChunksFlag result = 0; const auto cachingMode = ShaderStorage::GetCachingMode(); - if (cachingMode == ShaderStorage::CachingMode::AssetInternal && IsNullRenderer()) + if (cachingMode == ShaderStorage::CachingMode::AssetInternal && !IsNullRenderer()) result |= GET_CHUNK_FLAG(GetCacheChunkIndex()); return result; }