From 706dc0e30343335f6672f6cefb40e51d5bbf6e9b Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Mon, 1 Apr 2019 11:31:38 +0200
Subject: [PATCH] Fixed some issues with merge
---
libraries/image/src/image/TextureProcessing.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libraries/image/src/image/TextureProcessing.cpp b/libraries/image/src/image/TextureProcessing.cpp
index 1563ba7079..00e6fd806d 100644
--- a/libraries/image/src/image/TextureProcessing.cpp
+++ b/libraries/image/src/image/TextureProcessing.cpp
@@ -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.