godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes importing hdr files with extra header info 

(cherry picked from commit 886156da2c)
This commit is contained in:
Jorn Van denbussche 2018-03-11 19:21:09 +01:00 committed by Hein-Pieter van Braam
parent 7ec8a6e756
commit 80fbea28fb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/hdr/image_loader_hdr.cpp
View File

@ -42,14 +42,18 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
ERR_FAIL_COND_V(header != "#?RADIANCE" && header != "#?RGBE", ERR_FILE_UNRECOGNIZED); ERR_FAIL_COND_V(header != "#?RADIANCE" && header != "#?RGBE", ERR_FILE_UNRECOGNIZED);
while (true) { while (true) {
String format = f->get_token(); String line = f->get_line();
ERR_FAIL_COND_V(f->eof_reached(), ERR_FILE_UNRECOGNIZED); ERR_FAIL_COND_V(f->eof_reached(), ERR_FILE_UNRECOGNIZED);
if (format.begins_with("FORMAT=") && format != "FORMAT=32-bit_rle_rgbe") { if (line == "") // empty line indicates end of header
ERR_EXPLAIN("Only 32-bit_rle_rgbe is supported for .hdr files."); break;
if (line.begins_with("FORMAT=")) { // leave option to implement other commands
if (line != "FORMAT=32-bit_rle_rgbe") {
ERR_EXPLAIN("Only 32-bit_rle_rgbe is supported for HDR files.");
return ERR_FILE_UNRECOGNIZED; return ERR_FILE_UNRECOGNIZED;
} }
if (format == "FORMAT=32-bit_rle_rgbe") } else if (!line.begins_with("#")) { // not comment
break; WARN_PRINTS("Ignoring unsupported header information in HDR : " + line);
}
} }
String token = f->get_token(); String token = f->get_token();