From 9d56001341a6fdcfd1e252448ba0a6f87fd2f64b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 8 Mar 2017 12:11:25 -0800
Subject: [PATCH] Fix rebase

---
 .../model-networking/src/model-networking/TextureCache.cpp   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp
index b1ed4fcc5d..c58c157da2 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.cpp
+++ b/libraries/model-networking/src/model-networking/TextureCache.cpp
@@ -497,7 +497,7 @@ void FileReader::read() {
         gpu::Texture::Usage usage;
         gpu::TextureUsageType usageType(gpu::TextureUsageType::RESOURCE);
         gpu::Sampler sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR);
-        texture.reset(gpu::Texture::unserialize(usage, usageType, ktx, sampler));
+        texture.reset(gpu::Texture::unserialize(ktx, usageType, usage, sampler.getDesc()));
         texture->setKtxBacking(ktx);
     }
 
@@ -556,7 +556,8 @@ void ImageReader::read() {
         auto url = _url.toString().toStdString();
 
         PROFILE_RANGE_EX(resource_parse_image, __FUNCTION__, 0xffff0000, 0);
-        texture.reset(resource.staticCast<NetworkTexture>()->getTextureLoader()(image, url));
+        auto networkTexture = resource.staticCast<NetworkTexture>();
+        texture.reset(networkTexture->getTextureLoader()(image, url));
         texture->setSource(url);
         if (texture) {
             texture->setFallbackTexture(networkTexture->getFallbackTexture());