Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed some issues with merge

Browse source
This commit is contained in:
Olivier Prat 2019-04-01 11:31:38 +02:00
parent 59eeb9361e
commit 706dc0e303
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/image/src/image/TextureProcessing.cpp
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) { Image processRawImageData(QIODevice& content, const std::string& filename) {
// Help the Image loader by extracting the image file format from the url filename ext. // Help the Image loader by extracting the image file format from the url filename ext.
// Some tga are not created properly without it. // Some tga are not created properly without it.