Skip to content

Commit e5d2cfc

Browse files
authored
Merge branch 'master' into patch-1
2 parents 9bcd0f4 + 855f849 commit e5d2cfc

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CONTRIBUTORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
177177
* [Tamar Cohen](https://github.com/tamarmot)
178178
* [Stephen Wiseman](https://github.com/srwiseman)
179179
* [Gabriel Macario](https://github.com/gabriel-macario)
180+
* [Jonathan Puckey](https://github.com/puckey)
180181
* [Mark Erikson](https://github.com/markerikson)

Source/Scene/Globe.js

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ define([
2424
'./GlobeSurfaceShaderSet',
2525
'./GlobeSurfaceTileProvider',
2626
'./ImageryLayerCollection',
27-
'./Material',
2827
'./QuadtreePrimitive',
2928
'./SceneMode',
3029
'./ShadowMode'
@@ -54,7 +53,6 @@ define([
5453
GlobeSurfaceShaderSet,
5554
GlobeSurfaceTileProvider,
5655
ImageryLayerCollection,
57-
Material,
5856
QuadtreePrimitive,
5957
SceneMode,
6058
ShadowMode) {

0 commit comments

Comments
 (0)