Skip to content

Commit 2544dab

Browse files
committed
Merge remote-tracking branch 'origin/master' into trackedEntityChangedEvent
# Conflicts: # CHANGES.md
2 parents 0a8f549 + 9687c3e commit 2544dab

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Change Log
44
### 1.32 - 2017-04-03
55

66
* Added the event `Viewer.trackedEntityChanged`, which is raised when the value of `viewer.trackedEntity` changes. [#5060](https://github.com/AnalyticalGraphicsInc/cesium/pull/5060)
7+
* Fix crunch compressed textures in IE11. [#5057](https://github.com/AnalyticalGraphicsInc/cesium/pull/5057)
78

89
### 1.31 - 2017-03-01
910

Source/Workers/transcodeCRNToDXT.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,10 @@ define([
133133

134134
// Mipmaps are unsupported, so copy the level 0 texture
135135
// When mipmaps are supported, a copy will still be necessary as dxtData is a view on the heap.
136-
var level0DXTData = dxtData.slice(0, PixelFormat.compressedTextureSize(format, width, height));
136+
var length = PixelFormat.compressedTextureSize(format, width, height);
137+
var level0DXTData = new Uint8Array(length);
138+
level0DXTData.set(dxtData, 0);
139+
137140
transferableObjects.push(level0DXTData.buffer);
138141
return new CompressedTextureBuffer(format, width, height, level0DXTData);
139142
}

0 commit comments

Comments
 (0)