Skip to content

Commit 30d215b

Browse files
authoredJul 31, 2019
Merge pull request #7998 from ppoulainpro/patch-7990
Patch for #7990
2 parents 3d4121b + 7bd5d7d commit 30d215b

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed
 

‎CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Change Log
88
* Added a [new Sandcastle example](https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/?src=Labels%20SDF.html) to showcase the new SDF labels.
99
* 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.
1010
* Added support for polygon holes to CZML. [#7991](https://github.com/AnalyticalGraphicsInc/cesium/pull/7991)
11+
* Fixed crash when using ArcGIS terrain with clipping planes. [#7998](https://github.com/AnalyticalGraphicsInc/cesium/pull/7998)
1112

1213
##### Fixes :wrench:
1314
* `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`.

‎CONTRIBUTORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
215215
* [Merijn Wijngaard](https://github.com/mwijngaard)
216216
* [Dennis Adams](https://github.com/dennisadams)
217217
* [Hai Zhou](https://github.com/verybigzhouhai)
218+
* [Pascal Poulain](https://github.com/ppoulainpro)

‎Source/Scene/GlobeSurfaceTileProvider.js

+7
Original file line numberDiff line numberDiff line change
@@ -1619,6 +1619,13 @@ define([
16191619
--maxTextures;
16201620
}
16211621

1622+
if (defined(frameState.shadowState) && frameState.shadowState.shadowsEnabled) {
1623+
--maxTextures;
1624+
}
1625+
if (defined(tileProvider.clippingPlanes) && tileProvider.clippingPlanes.enabled) {
1626+
--maxTextures;
1627+
}
1628+
16221629
var mesh = surfaceTile.renderedMesh;
16231630
var rtc = mesh.center;
16241631
var encoding = mesh.encoding;

0 commit comments

Comments
 (0)