Skip to content

Commit bba1c5d

Browse files
authored
Merge pull request #8202 from AnalyticalGraphicsInc/fix-blending-state
Merged fix blending state branch
2 parents 24aa1f7 + 460984c commit bba1c5d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Change Log
2727
* Fixed a crash for 3D Tiles that have zero volume. [#7945](https://github.com/AnalyticalGraphicsInc/cesium/pull/7945)
2828
* Fixed a bug where dynamic polylines did not use the given arcType. [#8191](https://github.com/AnalyticalGraphicsInc/cesium/issues/8191)
2929
* Fixed a bug where GlobeSurfaceTile would not render the tile until all layers completed loading causing globe to appear to hang. [#7974](https://github.com/AnalyticalGraphicsInc/cesium/issues/7974)
30+
* Fixed alpha equation for `BlendingState.ALPHA_BLEND` and `BlendingState.ADDITIVE_BLEND`. [#8202](https://github.com/AnalyticalGraphicsInc/cesium/pull/8202)
3031

3132
### 1.61 - 2019-09-03
3233

Source/Scene/BlendingState.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ define([
4040
equationRgb : BlendEquation.ADD,
4141
equationAlpha : BlendEquation.ADD,
4242
functionSourceRgb : BlendFunction.SOURCE_ALPHA,
43-
functionSourceAlpha : BlendFunction.SOURCE_ALPHA,
43+
functionSourceAlpha : BlendFunction.ONE,
4444
functionDestinationRgb : BlendFunction.ONE_MINUS_SOURCE_ALPHA,
4545
functionDestinationAlpha : BlendFunction.ONE_MINUS_SOURCE_ALPHA
4646
}),
@@ -72,7 +72,7 @@ define([
7272
equationRgb : BlendEquation.ADD,
7373
equationAlpha : BlendEquation.ADD,
7474
functionSourceRgb : BlendFunction.SOURCE_ALPHA,
75-
functionSourceAlpha : BlendFunction.SOURCE_ALPHA,
75+
functionSourceAlpha : BlendFunction.ONE,
7676
functionDestinationRgb : BlendFunction.ONE,
7777
functionDestinationAlpha : BlendFunction.ONE
7878
})

0 commit comments

Comments
 (0)