diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-12-21 14:20:35 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-12-21 14:22:17 -0300 |
commit | 37f558cd7b2308f6442f74c5265f12425d9887c8 (patch) | |
tree | 88901b350f7674013f7aecf8fddf3f1c3dbd7399 /tools | |
parent | 72b844c34999d8615450798ed1f27ef24a72d8ce (diff) |
Some BRDF fixes
Diffstat (limited to 'tools')
-rw-r--r-- | tools/editor/editor_initialize_ssl.cpp | 3 | ||||
-rw-r--r-- | tools/editor/editor_resource_preview.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/editor_initialize_ssl.cpp b/tools/editor/editor_initialize_ssl.cpp index c0b55b302f..968afba9d6 100644 --- a/tools/editor/editor_initialize_ssl.cpp +++ b/tools/editor/editor_initialize_ssl.cpp @@ -35,10 +35,11 @@ void editor_initialize_certificates() { ByteArray data; - data.resize(_certs_uncompressed_size); + data.resize(_certs_uncompressed_size+1); { ByteArray::Write w = data.write(); Compression::decompress(w.ptr(),_certs_uncompressed_size,_certs_compressed,_certs_compressed_size,Compression::MODE_DEFLATE); + w[_certs_uncompressed_size]=0; //make sure it ends at zero } StreamPeerSSL::load_certs_from_memory(data); diff --git a/tools/editor/editor_resource_preview.cpp b/tools/editor/editor_resource_preview.cpp index 6afc3e2a34..46b81dc072 100644 --- a/tools/editor/editor_resource_preview.cpp +++ b/tools/editor/editor_resource_preview.cpp @@ -267,6 +267,8 @@ void EditorResourcePreview::_thread() { memdelete(f); } + cache_valid=false; + if (cache_valid) { texture = ResourceLoader::load(cache_base+".png","ImageTexture",true); |