Merge pull request #7998 from ppoulainpro/patch-7990

Patch for #7990
CesiumGS · Jul 31, 2019 · 30d215b · 30d215b
2 parents 3d4121b + 7bd5d7d
commit 30d215b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +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)
+* 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`.

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -215,3 +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)
diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js
@@ -1619,6 +1619,13 @@ define([
             --maxTextures;
         }
 
+        if (defined(frameState.shadowState) && frameState.shadowState.shadowsEnabled) {
+            --maxTextures;
+        }
+        if (defined(tileProvider.clippingPlanes) && tileProvider.clippingPlanes.enabled) {
+            --maxTextures;
+        }
+
         var mesh = surfaceTile.renderedMesh;
         var rtc = mesh.center;
         var encoding = mesh.encoding;