diff --git a/CHANGES.md b/CHANGES.md index 3119616a8d9c..b14dfd41a147 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,6 +33,7 @@ Change Log * Added `Matrix4.computeView`. * Added `CullingVolume.fromBoundingSphere`. * Added `debugShowShadowVolume` to `GroundPrimitive`. +* Fix issue with disappearing tiles on Linux. [#3889](https://github.com/AnalyticalGraphicsInc/cesium/issues/3889) ### 1.21 - 2016-05-02 diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js index 72670f66b14e..58dc795e919e 100644 --- a/Source/Scene/GlobeSurfaceShaderSet.js +++ b/Source/Scene/GlobeSurfaceShaderSet.js @@ -35,8 +35,7 @@ define([ function getPositionMode(sceneMode) { var getPosition3DMode = 'vec4 getPosition(vec3 position, float height, vec2 textureCoordinates) { return getPosition3DMode(position, height, textureCoordinates); }'; - var getPosition2DMode = 'vec4 getPosition(vec3 position, float height, vec2 textureCoordinates) { return getPosition2DMode(position, height, textureCoordinates); }'; - var getPositionColumbusViewMode = 'vec4 getPosition(vec3 position, float height, vec2 textureCoordinates) { return getPositionColumbusViewMode(position, height, textureCoordinates); }'; + var getPositionColumbusViewAnd2DMode = 'vec4 getPosition(vec3 position, float height, vec2 textureCoordinates) { return getPositionColumbusViewMode(position, height, textureCoordinates); }'; var getPositionMorphingMode = 'vec4 getPosition(vec3 position, float height, vec2 textureCoordinates) { return getPositionMorphingMode(position, height, textureCoordinates); }'; var positionMode; @@ -46,10 +45,8 @@ define([ positionMode = getPosition3DMode; break; case SceneMode.SCENE2D: - positionMode = getPosition2DMode; - break; case SceneMode.COLUMBUS_VIEW: - positionMode = getPositionColumbusViewMode; + positionMode = getPositionColumbusViewAnd2DMode; break; case SceneMode.MORPHING: positionMode = getPositionMorphingMode;