diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-06-16 21:47:28 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-16 21:49:37 -0300 |
| commit | b19225bfce3dab39f8ce6b1ecf610ea0ba650f99 (patch) | |
| tree | 7946e6eabae1c679a404a9146343fe2b6f2672b7 /core/io | |
| parent | 8a03a29233d5ef4cf5be3aeebd76cb77c82bc983 (diff) | |
-Fix freezes caused by etccomp2, closes #9183
-Normalmaps are now detected and imported as RGTC, both in S3TC and ETC2, this improves their quality.
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/compression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 9ae54c38af..f806c4da6d 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -58,7 +58,7 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, strm.zalloc = zipio_alloc; strm.zfree = zipio_free; strm.opaque = Z_NULL; - int level = GLOBAL_GET("compression/zlib_compression_level"); + int level = GLOBAL_GET("compression/zlib/compression_level"); int err = deflateInit(&strm, level); if (err != Z_OK) return -1; @@ -81,7 +81,7 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, case MODE_ZSTD: { int max_dst_size = get_max_compressed_buffer_size(p_src_size, MODE_ZSTD); - int level = GLOBAL_GET("compression/zstd_compression_level"); + int level = GLOBAL_GET("compression/zstd/compression_level"); return ZSTD_compress(p_dst, max_dst_size, p_src, p_src_size, level); } break; } |