Allow to disable the suspendTerrainAdjustment behaviour

See CesiumGS#5999
camptocamp · Nov 24, 2017 · b66b853 · b66b853
1 parent 3228541
commit b66b853
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Scene/Camera.js b/Source/Scene/Camera.js
@@ -367,6 +367,7 @@ define([
     var scratchAdjustHeightTransform = new Matrix4();
     var scratchAdjustHeightCartographic = new Cartographic();
 
+    Camera.enableSuspendTerrainAdjustment = true;
     Camera.prototype._adjustHeightForTerrain = function() {
         var scene = this._scene;
 
@@ -375,7 +376,7 @@ define([
         var minimumCollisionTerrainHeight = screenSpaceCameraController.minimumCollisionTerrainHeight;
         var minimumZoomDistance = screenSpaceCameraController.minimumZoomDistance;
 
-        if (this._suspendTerrainAdjustment || !enableCollisionDetection) {
+        if ((Camera.enableSuspendTerrainAdjustment && this._suspendTerrainAdjustment) || !enableCollisionDetection) {
             return;
         }