Merge pull request #6295 from AnalyticalGraphicsInc/classification-edge

Fix classification 3D Tiles in Edge

Author: Hannah

CHANGES.md

@@ -46,7 +46,7 @@ Change Log
 * Fixed `Material` so it can now take a `Resource` object as an image. [#6199](https://github.com/AnalyticalGraphicsInc/cesium/issues/6199)
 * Fixed an issue causing the Bing Maps key to be sent unnecessarily with every tile request. [#6250](https://github.com/AnalyticalGraphicsInc/cesium/pull/6250)
 * Fixed documentation issue for the `Cesium.Math` class. [#6233](https://github.com/AnalyticalGraphicsInc/cesium/issues/6233)
-* Fix Firefox WebGL console warnings. [#5912](https://github.com/AnalyticalGraphicsInc/cesium/issues/5912)
+* Fixed rendering 3D Tiles as classification volumes. [#6295](https://github.com/AnalyticalGraphicsInc/cesium/pull/6295)
 
 ### 1.42.1 - 2018-02-01
 _This is an npm-only release to fix an issue with using Cesium in Node.js.__

Source/Scene/Cesium3DTileBatchTable.js

@@ -1093,6 +1093,7 @@ define([
                     'varying vec4 tile_featureColor; \n' +
                     'void main() \n' +
                     '{ \n' +
+                    '    tile_main(); \n' +
                     '    gl_FragColor = tile_featureColor; \n' +
                     '}';
             } else {
@@ -1101,6 +1102,7 @@ define([
                     'varying vec2 tile_featureSt; \n' +
                     'void main() \n' +
                     '{ \n' +
+                    '    tile_main(); \n' +
                     '    vec4 featureProperties = texture2D(tile_batchTexture, tile_featureSt); \n' +
                     '    if (featureProperties.a == 0.0) { \n' + // show: alpha == 0 - false, non-zeo - true
                     '        discard; \n' +