mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-07 19:23:04 +02:00
Fixed some issues with merge
This commit is contained in:
parent
59eeb9361e
commit
706dc0e303
1 changed files with 4 additions and 0 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue