From 4571f28ee20c031bf13980486c58793966d0c147 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Tue, 30 Jul 2019 23:38:25 +0200 Subject: [PATCH] Cleanup --- CHANGES.md | 4 +--- CONTRIBUTORS.md | 2 +- Source/Scene/GlobeSurfaceTileProvider.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 56258c3f532d..95fb16270c3a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Change Log * Added a [new Sandcastle example](https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/?src=Labels%20SDF.html) to showcase the new SDF labels. * Added `totalScale` property to `Label` which is the total scale of the label taking into account the label's scale and the relative size of the desired font compared to the generated glyph size. * Added support for polygon holes to CZML. [#7991](https://github.com/AnalyticalGraphicsInc/cesium/pull/7991) -* Clipping plane with Arcgis terrain cause WebGL Error [#7998](https://github.com/AnalyticalGraphicsInc/cesium/pull/7998). +* Fixed crash when using ArcGIS terrain with clipping planes. [#7998](https://github.com/AnalyticalGraphicsInc/cesium/pull/7998) ##### Fixes :wrench: * `PolygonGraphics.hierarchy` now converts constant array values to a `PolygonHierarchy` when set, so code that accesses the value of the property can rely on it always being a `PolygonHierarchy`. @@ -3625,5 +3625,3 @@ Alpha Releases ### a0 - 2011-06-17 * Initial Release. - - diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5cc3d84cfecd..6e4ae86ec29d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -215,4 +215,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Merijn Wijngaard](https://github.com/mwijngaard) * [Dennis Adams](https://github.com/dennisadams) * [Hai Zhou](https://github.com/verybigzhouhai) -* [Pascal Poulain] https://github.com/ppoulainpro) +* [Pascal Poulain](https://github.com/ppoulainpro) diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index ab02aa8eddf1..80bcf17bc9b5 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -1622,7 +1622,7 @@ define([ if (defined(frameState.shadowState) && frameState.shadowState.shadowsEnabled) { --maxTextures; } - if (defined(tileProvider.clippingPlanes)) { + if (defined(tileProvider.clippingPlanes) && tileProvider.clippingPlanes.enabled) { --maxTextures; }