Merge branch 'master' of https://github.com/highfidelity/hifi into temp1

interface/src/ui/overlays/ImageOverlay.cpp

@@ -45,7 +45,6 @@ ImageOverlay::~ImageOverlay() {
 // TODO: handle setting image multiple times, how do we manage releasing the bound texture?
 void ImageOverlay::setImageURL(const QUrl& url) {
     _imageURL = url;
-
     if (url.isEmpty()) {
         _isLoaded = true;
         _renderImage = false;

libraries/gpu/src/gpu/Texture.cpp

@@ -254,7 +254,16 @@ bool Texture::assignStoredMip(uint16 level, const Element& format, Size size, co
     }
 
     // THen check that the mem buffer passed make sense with its format
-    if (size == evalStoredMipSize(level, format)) {
+    Size expectedSize = evalStoredMipSize(level, format);
+    if (size == expectedSize) {
+        _storage->assignMipData(level, format, size, bytes);
+        _stamp++;
+        return true;
+    } else if (size > expectedSize) {
+        // NOTE: We are facing this case sometime because apparently QImage (from where we get the bits) is generating images
+        // and alligning the line of pixels to 32 bits.
+        // We should probably consider something a bit more smart to get the correct result but for now (UI elements)
+        // it seems to work...
         _storage->assignMipData(level, format, size, bytes);
         _stamp++;
         return true;

libraries/render-utils/src/TextureCache.cpp

@@ -387,7 +387,7 @@ NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArr
     if (!url.isValid()) {
         _loaded = true;
     }
-    
+
     // default to white/blue/black
   /*  glBindTexture(GL_TEXTURE_2D, getID());
     switch (type) {