Skip to content

Commit

Permalink
Only force camera above terrain when loading is finished.
Browse files Browse the repository at this point in the history
Fixes #6962

I'm not sure if we introduced a regression somewhere or if we just never
noticed, but the desired camera behavior is that it not force the view to
be above terrain if there is still terrain loading.  I also confirmed
that #4075 is still fixed even with this change.
  • Loading branch information
mramato committed Aug 31, 2018
1 parent 8977b1a commit 933cf59
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Source/Scene/Camera.js
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,10 @@ define([
if (this._suspendTerrainAdjustment) {
this._suspendTerrainAdjustment = !globeFinishedUpdating;
}
this._adjustHeightForTerrain();

if (globeFinishedUpdating) {
this._adjustHeightForTerrain();
}
};

var setTransformPosition = new Cartesian3();
Expand Down

0 comments on commit 933cf59

Please sign in to comment.