Skip to content

Commit 8d7902c

Browse files
author
hpinkos
committed
Merge branch 'master' into z-index
2 parents b0a31b7 + 3300963 commit 8d7902c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGES.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ Change Log
2424
* Fixed race condition causing intermittent crash when changing geometry show value [#3061](https://github.com/AnalyticalGraphicsInc/cesium/issues/3061)
2525
* `ProviderViewModel`s with no category are displayed in an untitled group in `BaseLayerPicker` instead of being labeled as `'Other'` [#6574](https://github.com/AnalyticalGraphicsInc/cesium/pull/6574)
2626
* Added a workaround for clipping planes causing a picking shader compilation failure for gltf models and 3D Tilesets in Internet Explorer [#6575](https://github.com/AnalyticalGraphicsInc/cesium/issues/6575)
27-
* Fixed polygon outline when using `perPositionHeight` and `extrudedHeight`. [#6595](https://github.com/AnalyticalGraphicsInc/cesium/issues/6595)
27+
* Allowed Bing Maps servers with a subpath (instead of being at the root) to work correctly. [#6597](https://github.com/AnalyticalGraphicsInc/cesium/pull/6597)
28+
* Fixed polygon outline when using `perPositionHeight` and `extrudedHeight`. [#6595](https://github.com/AnalyticalGraphicsInc/cesium/issues/6595)
2829
* Fixed broken links in documentation of `createTileMapServiceImageryProvider`. [#5818](https://github.com/AnalyticalGraphicsInc/cesium/issues/5818)
2930

3031
##### Breaking Changes :mega:

Source/DataSources/StaticGroundGeometryColorBatch.js

+2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ define([
7272
this.subscriptions.remove(id);
7373
this.showsUpdated.remove(id);
7474
}
75+
return true;
7576
}
77+
return false;
7678
};
7779

7880
var scratchArray = new Array(4);

Source/DataSources/StaticGroundGeometryPerMaterialBatch.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ define([
107107
unsubscribe();
108108
this.subscriptions.remove(id);
109109
}
110+
return true;
110111
}
111-
return this.createPrimitive;
112+
return false;
112113
};
113114

114115
Batch.prototype.update = function(time) {

0 commit comments

Comments
 (0)