Merge pull request #7877 from AnalyticalGraphicsInc/fix-credits

Fix 3D Tiles credits

Author: loshjawrence

CHANGES.md

@@ -1,5 +1,6 @@
 Change Log
 ==========
+
 ### 1.58 - 2019-06-03
 
 ##### Additions :tada:
@@ -13,6 +14,7 @@ Change Log
 * Fixed an edge case where Cesium would provide ion access token credentials to non-ion servers if the actual asset entrypoint was being hosted by ion. [#7839](https://github.com/AnalyticalGraphicsInc/cesium/pull/7839)
 * Fixed a bug that caused Cesium to request non-existent tiles for terrain tilesets lacking tile availability, i.e. a `layer.json` file.
 * Fixed memory leak when removing entities that had a `HeightReference` of `CLAMP_TO_GROUND` or `RELATIVE_TO_GROUND`. This includes when removing a `DataSource`. 
+* Fixed 3D Tiles credits not being shown in the data attribution box. [#7877](https://github.com/AnalyticalGraphicsInc/cesium/pull/7877)
 
 ### 1.57 - 2019-05-01
 

Source/Scene/Scene.js

@@ -3198,9 +3198,12 @@ define([
     }
 
     function prePassesUpdate(scene) {
+        var frameState = scene._frameState;
+        frameState.creditDisplay.update();
+        frameState.creditDisplay.beginFrame();
+
         scene._jobScheduler.resetBudgets();
 
-        var frameState = scene._frameState;
         var primitives = scene.primitives;
         primitives.prePassesUpdate(frameState);
 
@@ -3209,7 +3212,6 @@ define([
         }
 
         scene._pickPositionCacheDirty = true;
-        frameState.creditDisplay.update();
     }
 
     function postPassesUpdate(scene) {
@@ -3218,6 +3220,7 @@ define([
         primitives.postPassesUpdate(frameState);
 
         RequestScheduler.update();
+        frameState.creditDisplay.endFrame();
     }
 
     var scratchBackgroundColor = new Color();
@@ -3245,8 +3248,6 @@ define([
         }
         frameState.backgroundColor = backgroundColor;
 
-        frameState.creditDisplay.beginFrame();
-
         scene.fog.update(frameState);
 
         us.update(frameState);
@@ -3292,7 +3293,6 @@ define([
             }
         }
 
-        frameState.creditDisplay.endFrame();
         context.endFrame();
     }