From 8ba647bf8bf850c3c72ebe1afedf4c4e601a38db Mon Sep 17 00:00:00 2001
From: hpinkos <hannah@cesium.com>
Date: Wed, 17 Oct 2018 13:26:07 -0400
Subject: [PATCH] Fixes #7160

---
 Source/DataSources/StaticGeometryColorBatch.js       | 4 +++-
 Source/DataSources/StaticGeometryPerMaterialBatch.js | 3 ++-
 Source/DataSources/StaticOutlineGeometryBatch.js     | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/DataSources/StaticGeometryColorBatch.js b/Source/DataSources/StaticGeometryColorBatch.js
index 84ef60792282..8fb868d1a8af 100644
--- a/Source/DataSources/StaticGeometryColorBatch.js
+++ b/Source/DataSources/StaticGeometryColorBatch.js
@@ -109,7 +109,9 @@ define([
                 this.subscriptions.remove(id);
                 this.showsUpdated.remove(id);
             }
+            return true;
         }
+        return false;
     };
 
     Batch.prototype.update = function(time) {
@@ -353,8 +355,8 @@ define([
                 if (item.updaters.length === 0) {
                     items.splice(i, 1);
                     item.destroy();
-                    return true;
                 }
+                return true;
             }
         }
         return false;
diff --git a/Source/DataSources/StaticGeometryPerMaterialBatch.js b/Source/DataSources/StaticGeometryPerMaterialBatch.js
index 324e6b29010a..7a9fbccc46ad 100644
--- a/Source/DataSources/StaticGeometryPerMaterialBatch.js
+++ b/Source/DataSources/StaticGeometryPerMaterialBatch.js
@@ -104,8 +104,9 @@ define([
                 this.subscriptions.remove(id);
                 this.showsUpdated.remove(id);
             }
+            return true;
         }
-        return this.createPrimitive;
+        return false
     };
 
     var colorScratch = new Color();
diff --git a/Source/DataSources/StaticOutlineGeometryBatch.js b/Source/DataSources/StaticOutlineGeometryBatch.js
index 4836522d3ec6..3cfc3a3da71f 100644
--- a/Source/DataSources/StaticOutlineGeometryBatch.js
+++ b/Source/DataSources/StaticOutlineGeometryBatch.js
@@ -79,7 +79,9 @@ define([
                 this.subscriptions.remove(id);
                 this.showsUpdated.remove(id);
             }
+            return true;
         }
+        return false;
     };
 
     Batch.prototype.update = function(time) {