From 99c563602f34349614b409e7b96e6663213485d6 Mon Sep 17 00:00:00 2001
From: Bing Shearer <bingshearer@gmail.com>
Date: Thu, 9 Jul 2015 15:25:37 -0700
Subject: [PATCH] Fixed Else case where _renderImage is true but the texture
 has 0 size, else case did not previously exist.

---
 interface/src/ui/overlays/ImageOverlay.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp
index e80c6f584b..7a0c3c00c3 100644
--- a/interface/src/ui/overlays/ImageOverlay.cpp
+++ b/interface/src/ui/overlays/ImageOverlay.cpp
@@ -75,8 +75,6 @@ void ImageOverlay::render(RenderArgs* args) {
     glm::vec2 topLeft(left, top);
     glm::vec2 bottomRight(right, bottom);
 
-
-
     // if for some reason our image is not over 0 width or height, don't attempt to render the image
     if (_renderImage) {
         float imageWidth = _texture->getWidth();
@@ -108,16 +106,15 @@ void ImageOverlay::render(RenderArgs* args) {
             glm::vec2 texCoordBottomRight(x + w, y + h);
 
             DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, quadColor);
-        }
-        else {
+        } else {
             DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, quadColor);
         }
-
-        if (_renderImage) {
-            glDisable(GL_TEXTURE_2D);
-        }
+        glDisable(GL_TEXTURE_2D);
+    } else {
+        DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, quadColor);
     }
 }
+
 void ImageOverlay::setProperties(const QScriptValue& properties) {
     Overlay2D::setProperties(properties);