From bddb0e1e7b279995b5dca2dba3ac42dbe5c9519c Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Mon, 19 Oct 2015 09:43:08 -0700 Subject: [PATCH] ifdef out buggy texture map code --- libraries/model/src/model/TextureMap.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/model/src/model/TextureMap.cpp b/libraries/model/src/model/TextureMap.cpp index 584debafb2..d443522a6f 100755 --- a/libraries/model/src/model/TextureMap.cpp +++ b/libraries/model/src/model/TextureMap.cpp @@ -186,6 +186,8 @@ double mapComponent(double sobelValue) { gpu::Texture* TextureUsage::createNormalTextureFromBumpImage(const QImage& srcImage, const std::string& srcImageName) { QImage image = srcImage; + + #if 0 // PR 5540 by AlessandroSigna // integrated here as a specialized TextureLoader for bumpmaps // The conversion is done using the Sobel Filter to calculate the derivatives from the grayscale image @@ -236,6 +238,7 @@ gpu::Texture* TextureUsage::createNormalTextureFromBumpImage(const QImage& srcIm result.setPixel(i, j, qRgbValue); } } + #endif gpu::Texture* theTexture = nullptr; if ((image.width() > 0) && (image.height() > 0)) {