diff options
Diffstat (limited to 'Source/Core/VideoCommon/Assets/TextureAsset.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/TextureAsset.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Assets/TextureAsset.cpp b/Source/Core/VideoCommon/Assets/TextureAsset.cpp index 8df36397e8..8cd92aa89f 100644 --- a/Source/Core/VideoCommon/Assets/TextureAsset.cpp +++ b/Source/Core/VideoCommon/Assets/TextureAsset.cpp @@ -136,6 +136,15 @@ bool TextureData::FromJson(const CustomAssetLibrary::AssetID& asset_id, if (type == "texture2d") { data->m_type = TextureData::Type::Type_Texture2D; + + if (!ParseSampler(asset_id, json, &data->m_sampler)) + { + return false; + } + } + else if (type == "texturecube") + { + data->m_type = TextureData::Type::Type_TextureCube; } else { @@ -146,11 +155,6 @@ bool TextureData::FromJson(const CustomAssetLibrary::AssetID& asset_id, return false; } - if (!ParseSampler(asset_id, json, &data->m_sampler)) - { - return false; - } - return true; } |
