From 088a20aa517e074035fd077bc8801c182a134762 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Wed, 29 May 2019 13:14:35 -0400
Subject: [PATCH 1/2] Fix credits

---
 CHANGES.md            | 2 ++
 Source/Scene/Scene.js | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 456fbba0075c..345f06499a36 100644
--- a/CHANGES.md
+++ b/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
 
diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js
index a3a89605b115..096599f8d141 100644
--- a/Source/Scene/Scene.js
+++ b/Source/Scene/Scene.js
@@ -3210,6 +3210,7 @@ define([
 
         scene._pickPositionCacheDirty = true;
         frameState.creditDisplay.update();
+        frameState.creditDisplay.beginFrame();
     }
 
     function postPassesUpdate(scene) {
@@ -3218,6 +3219,7 @@ define([
         primitives.postPassesUpdate(frameState);
 
         RequestScheduler.update();
+        frameState.creditDisplay.endFrame();
     }
 
     var scratchBackgroundColor = new Color();
@@ -3245,8 +3247,6 @@ define([
         }
         frameState.backgroundColor = backgroundColor;
 
-        frameState.creditDisplay.beginFrame();
-
         scene.fog.update(frameState);
 
         us.update(frameState);
@@ -3292,7 +3292,6 @@ define([
             }
         }
 
-        frameState.creditDisplay.endFrame();
         context.endFrame();
     }
 

From c2cf844097bb44a4f684b60c4e3b1bf9d985300a Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Wed, 29 May 2019 13:22:32 -0400
Subject: [PATCH 2/2] Ordering

---
 Source/Scene/Scene.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js
index 096599f8d141..ff0f5c303fd6 100644
--- a/Source/Scene/Scene.js
+++ b/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,8 +3212,6 @@ define([
         }
 
         scene._pickPositionCacheDirty = true;
-        frameState.creditDisplay.update();
-        frameState.creditDisplay.beginFrame();
     }
 
     function postPassesUpdate(scene) {