Fixed some issues with merge

This commit is contained in:
Olivier Prat 2019-04-01 11:31:38 +02:00
parent 59eeb9361e
commit 706dc0e303

View file

@ -264,6 +264,10 @@ std::function<glm::vec3(gpu::uint32)> getHDRUnpackingFunction(const gpu::Element
}
}
std::function<glm::vec3(gpu::uint32)> getHDRUnpackingFunction() {
return getHDRUnpackingFunction(GPU_CUBEMAP_HDR_FORMAT);
}
Image processRawImageData(QIODevice& content, const std::string& filename) {
// Help the Image loader by extracting the image file format from the url filename ext.
// Some tga are not created properly without it.