diff --git a/CHANGES.md b/CHANGES.md index ebca07449f14..ccea7a4fa878 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Change Log * * Fixed a crash that would occur when using dynamic `distanceDisplayCondition` properties. [#4403](https://github.com/AnalyticalGraphicsInc/cesium/pull/4403) * Fixed a bug affected models with multiple meshes without indices. [#4237](https://github.com/AnalyticalGraphicsInc/cesium/issues/4237) +* Fixed a glTF transparency bug where `blendFuncSeparate` parameters were loaded in the wrong order. [#4435](https://github.com/AnalyticalGraphicsInc/cesium/pull/4435) ### 1.26 - 2016-10-03 diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index a47091a90048..845812c6638f 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -2273,9 +2273,9 @@ define([ WebGLConstants.FUNC_ADD, WebGLConstants.FUNC_ADD]); var blendFuncSeparate = defaultValue(statesFunctions.blendFuncSeparate, [ - WebGLConstants.ONE, WebGLConstants.ONE, WebGLConstants.ZERO, + WebGLConstants.ONE, WebGLConstants.ZERO]); var colorMask = defaultValue(statesFunctions.colorMask, [true, true, true, true]); var depthRange = defaultValue(statesFunctions.depthRange, [0.0, 1.0]); @@ -2329,8 +2329,8 @@ define([ equationRgb : blendEquationSeparate[0], equationAlpha : blendEquationSeparate[1], functionSourceRgb : blendFuncSeparate[0], - functionSourceAlpha : blendFuncSeparate[1], - functionDestinationRgb : blendFuncSeparate[2], + functionDestinationRgb : blendFuncSeparate[1], + functionSourceAlpha : blendFuncSeparate[2], functionDestinationAlpha : blendFuncSeparate[3] } });