Merge pull request #4552 from erikmaarten/fix-imagery-layer-crash

Fixes #4377
CesiumGS · Nov 1, 2016 · 957d25b · 957d25b
2 parents d60dfce + 6e4b282
commit 957d25b
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js
@@ -567,6 +567,10 @@ define([
             imageryRectangle = imageryTileXYToRectangle(i, northwestTileCoordinates.y, imageryLevel);
             clippedImageryRectangle = Rectangle.simpleIntersection(imageryRectangle, imageryBounds, clippedRectangleScratch);
 
+            if (!defined(clippedImageryRectangle)) {
+                continue;
+            }
+
             maxU = Math.min(1.0, (clippedImageryRectangle.east - terrainRectangle.west) / terrainRectangle.width);
 
             // If this is the eastern-most imagery tile mapped to this terrain tile,
@@ -584,6 +588,11 @@ define([
 
                 imageryRectangle = imageryTileXYToRectangle(i, j, imageryLevel);
                 clippedImageryRectangle = Rectangle.simpleIntersection(imageryRectangle, imageryBounds, clippedRectangleScratch);
+
+                if (!defined(clippedImageryRectangle)) {
+                    continue;
+                }
+
                 minV = Math.max(0.0, (clippedImageryRectangle.south - terrainRectangle.south) / terrainRectangle.height);
 
                 // If this is the southern-most imagery tile mapped to this terrain tile,