Merge branch 'master' into define-jsep

AnalyticalGraphicsInc · 0f4737e1a46896911cb32631bc2be86d22449355 · Getz committed Jul 7, 2017 · Jul 7, 2017 · 0f4737e
2 parents c84e6fc + ed53607
commit 0f4737e1a46896911cb32631bc2be86d22449355
Unified Split

Showing with 2 additions and 1 deletion.

+1 −0 CHANGES.md

+1 −1 Source/Scene/Model.js
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@ Change Log
 
 ### 1.36 - 2017-08-01
 
+* Fixed a bug where a Model's compressed textures were not being displayed. [#5596](https://github.com/AnalyticalGraphicsInc/cesium/pull/5596)
 * Fixed a bug where jsep was undefined when using webpack [#5593](https://github.com/AnalyticalGraphicsInc/cesium/issues/5593)
 
 ### 1.35 - 2017-07-05
diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -1610,7 +1610,7 @@ define([
                     });
                 } else {
                     ++model._loadResources.pendingTextureLoads;
-                    var imagePath = joinUrls(model._baseUri, gltfImage.uri);
+                    var imagePath = joinUrls(model._baseUri, uri);
 
                     var promise;
                     if (ktxRegex.test(imagePath)) {