summaryrefslogtreecommitdiff
path: root/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2019-02-03 12:34:11 -0800
committerGitHub <noreply@github.com>2019-02-03 12:34:11 -0800
commit227a26490d3e130a3cafbead528e2a174f2ccb66 (patch)
treeb8c1b028ed8ccac2e38fa9c14b143b518a865cf9 /Source/Core/UICommon/ResourcePack/ResourcePack.cpp
parenteee24cd1ceb7006dee3f0015d957d8d14b3a5f1e (diff)
parentb6863ff0a206a2e44efa98960defc409ade99841 (diff)
Merge pull request #7773 from spycrab/rp_compression
ResourcePacks: Support compression
Diffstat (limited to 'Source/Core/UICommon/ResourcePack/ResourcePack.cpp')
-rw-r--r--Source/Core/UICommon/ResourcePack/ResourcePack.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 6f20c59ca9..92282626d5 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -126,8 +126,8 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
if (filename.compare(0, 9, "textures/") != 0 || texture_info.uncompressed_size == 0)
continue;
- // If a texture is compressed, abort.
- if (texture_info.compression_method != 0)
+ // If a texture is compressed and the manifest doesn't state that, abort.
+ if (!m_manifest->IsCompressed() && texture_info.compression_method != 0)
{
m_valid = false;
m_error = "Texture " + filename + " is compressed!";