From ec54ac7401a5186e882bbeaa5f4acea6a100af4f Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 29 Jan 2015 15:24:36 -0800 Subject: [PATCH] Fixing the non loading of some texture because the QImage bit size is not exactly what's expected --- interface/src/ui/overlays/ImageOverlay.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp index 73da8cc9c0..e354ea539e 100644 --- a/interface/src/ui/overlays/ImageOverlay.cpp +++ b/interface/src/ui/overlays/ImageOverlay.cpp @@ -56,8 +56,6 @@ void ImageOverlay::setImageURL(const QUrl& url) { } void ImageOverlay::render(RenderArgs* args) { - QString problem("http://s3.amazonaws.com/hifi-public/images/tools/grid-toolbar.svg"); - bool theONE = (_imageURL == problem); if (!_isLoaded && _renderImage) { _isLoaded = true; _texture = DependencyManager::get()->getTexture(_imageURL); @@ -70,17 +68,8 @@ void ImageOverlay::render(RenderArgs* args) { } if (_renderImage) { - glEnable(GL_TEXTURE_2D); - if (theONE) { - std::string name = _imageURL.toString().toStdString(); - } - GLuint texID = _texture->getID(); - if (texID == 27) { - std::string name = _imageURL.toString().toStdString(); - glBindTexture(GL_TEXTURE_2D, texID); - } else - glBindTexture(GL_TEXTURE_2D, _texture->getID()); + glBindTexture(GL_TEXTURE_2D, _texture->getID()); } const float MAX_COLOR = 255.0f;