From 240f48f05f0d5ceb59efad26461a173f05299480 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Thu, 6 Jul 2017 19:17:50 -0400 Subject: [PATCH 1/2] Fix path for compressed image in Model --- Source/Scene/Model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 0759964059f..06425037b1f 100644 --- 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)) { From cc1c1214e8751281c52b1712f73415d59b0c1685 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Thu, 6 Jul 2017 19:29:06 -0400 Subject: [PATCH 2/2] Updated CHANGES.md --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 01510bdcf2f..dc10421833d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ 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) + ### 1.35 - 2017-07-05 * Breaking changes