Skip to content

Commit 33b6bf0

Browse files
authored
Merge pull request #4977 from klingerj/fuchsia-color-spelling
Fixed spelling of Color.FUCHSIA
2 parents f8335d0 + 95d9b17 commit 33b6bf0

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Change Log
22
==========
33

44
### 1.31 - 2017-03-01
5+
* Breaking changes
6+
* Corrected spelling of `Color.FUCHSIA` from `Color.FUSCHIA`
57
* Added support to `DebugCameraPrimitive` to draw multifrustum planes. The attribute `debugShowFrustumPlanes` of `Scene` and `frustumPlanes` of `CesiumInspector` toggles this. `FrameState` has been augmented to include `frustumSplits` which is a `Number[]` of the near/far planes of the camera frustums.
68
* Enable rendering `GroundPrimitives` on hardware without the `EXT_frag_depth` extension; however, this could cause artifacts for certain viewing angles.
79
* Added compressed texture support. [#4758](https://github.com/AnalyticalGraphicsInc/cesium/pull/4758)

CONTRIBUTORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
126126
* [Aristeidis Bampakos](https://github.com/bampakoa)
127127
* [Jane Minghui Guo](https://github.com/Jane-Of-Art)
128128
* [Prasanna Natarajan](https://github.com/PrasannaNatarajan)
129+
* [Joseph Klinger](https://github.com/klingerj)

Source/Core/Color.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ define([
13741374
* @constant
13751375
* @type {Color}
13761376
*/
1377-
Color.FUSCHIA = freezeObject(Color.fromCssColorString('#FF00FF'));
1377+
Color.FUCHSIA = freezeObject(Color.fromCssColorString('#FF00FF'));
13781378

13791379
/**
13801380
* An immutable Color instance initialized to CSS color #DCDCDC

0 commit comments

Comments
 (0)