From 6fb074715e575a530548ed106341989542be9525 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 21 Apr 2017 15:28:29 -0700
Subject: [PATCH] Fix alpha rendering bug

---
 libraries/gpu/src/gpu/Texture_ktx.cpp          | 3 ++-
 libraries/render-utils/src/MeshPartPayload.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/gpu/src/gpu/Texture_ktx.cpp b/libraries/gpu/src/gpu/Texture_ktx.cpp
index 6828af4cc4..b2b08ca170 100644
--- a/libraries/gpu/src/gpu/Texture_ktx.cpp
+++ b/libraries/gpu/src/gpu/Texture_ktx.cpp
@@ -11,12 +11,13 @@
 
 
 #include "Texture.h"
-#include <qdebug.h>
 
 #include <QtCore/QByteArray>
 
 #include <ktx/KTX.h>
 
+#include "GPULogging.h"
+
 using namespace gpu;
 
 using PixelsPointer = Texture::PixelsPointer;
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 9232564514..51ce0fffa7 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -544,7 +544,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) const {
     }
 
     if (_fadeState == FADE_WAITING_TO_START) {
-        if (_model->isLoaded()) {
+        if (_model->isLoaded() && _model->getGeometry()->areTexturesLoaded()) {
             if (EntityItem::getEntitiesShouldFadeFunction()()) {
                 _fadeStartTime = usecTimestampNow();
                 _fadeState = FADE_IN_PROGRESS;