CesiumGS · mramato · Oct 7, 2016 · Oct 4, 2016 · Oct 7, 2016
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,14 @@
 Change Log
 ==========
 
+### 1.27 - 2016-11-01
+
+* Deprecated
+    * 
+* Breaking changes
+    * 
+* Fixed a crash that would occur when using dynamic `distanceDisplayCondition` properties. [#4403](https://github.com/AnalyticalGraphicsInc/cesium/pull/4403)
+
 ### 1.26 - 2016-10-03
 
 * Deprecated

diff --git a/Source/DataSources/BillboardVisualizer.js b/Source/DataSources/BillboardVisualizer.js
@@ -132,7 +132,7 @@ define([
 
             if (!show) {
                 //don't bother creating or updating anything else
-                cluster.removeBillboard(entity);
+                returnPrimitive(item, entity, cluster);
                 continue;
             }
 
@@ -254,17 +254,24 @@ define([
                     items.set(entity.id, new EntityData(entity));
                 }
             } else {
-                cluster.removeBillboard(entity);
+                returnPrimitive(items.get(entity.id), entity, cluster);
                 items.remove(entity.id);
             }
         }
 
         for (i = removed.length - 1; i > -1; i--) {
             entity = removed[i];
-            cluster.removeBillboard(entity);
+            returnPrimitive(items.get(entity.id), entity, cluster);
             items.remove(entity.id);
         }
     };
 
+    function returnPrimitive(item, entity, cluster) {
+        if (defined(item)) {
+            item.billboard = undefined;
+            cluster.removeBillboard(entity);
+        }
+    }
+
     return BillboardVisualizer;
 });
diff --git a/Source/DataSources/EntityCluster.js b/Source/DataSources/EntityCluster.js
@@ -525,6 +525,7 @@ define([
 
         var label = this._labelCollection.get(index);
         label.show = false;
+        label.text = '';
         label.id = undefined;
 
         this._unusedLabelIndices.push(index);

diff --git a/Source/DataSources/LabelVisualizer.js b/Source/DataSources/LabelVisualizer.js
@@ -134,7 +134,7 @@ define([
 
             if (!show) {
                 //don't bother creating or updating anything else
-                cluster.removeLabel(entity);
+                returnPrimitive(item, entity, cluster);
                 continue;
             }
 
@@ -238,17 +238,24 @@ define([
                     items.set(entity.id, new EntityData(entity));
                 }
             } else {
-                cluster.removeLabel(entity);
+                returnPrimitive(items.get(entity.id), entity, cluster);
                 items.remove(entity.id);
             }
         }
 
         for (i = removed.length - 1; i > -1; i--) {
             entity = removed[i];
-            cluster.removeLabel(entity);
+            returnPrimitive(items.get(entity.id), entity, cluster);
             items.remove(entity.id);
         }
     };
 
+    function returnPrimitive(item, entity, cluster) {
+        if (defined(item)) {
+            item.label = undefined;
+            cluster.removeLabel(entity);
+        }
+    }
+
     return LabelVisualizer;
 });
diff --git a/Source/DataSources/StaticGeometryColorBatch.js b/Source/DataSources/StaticGeometryColorBatch.js
@@ -4,20 +4,27 @@ define([
         '../Core/Color',
         '../Core/ColorGeometryInstanceAttribute',
         '../Core/defined',
+        '../Core/DistanceDisplayCondition',
+        '../Core/DistanceDisplayConditionGeometryInstanceAttribute',
         '../Core/ShowGeometryInstanceAttribute',
         '../Scene/Primitive',
-        './BoundingSphereState'
+        './BoundingSphereState',
+        './Property'
     ], function(
         AssociativeArray,
         Color,
         ColorGeometryInstanceAttribute,
         defined,
+        DistanceDisplayCondition,
+        DistanceDisplayConditionGeometryInstanceAttribute,
         ShowGeometryInstanceAttribute,
         Primitive,
-        BoundingSphereState) {
+        BoundingSphereState,
+        Property) {
     'use strict';
 
     var colorScratch = new Color();
+    var distanceDisplayConditionScratch = new DistanceDisplayCondition();
 
     function Batch(primitives, translucent, appearanceType, closed, shadows) {
         this.translucent = translucent;
@@ -43,7 +50,7 @@ define([
         this.createPrimitive = true;
         this.geometry.set(id, instance);
         this.updaters.set(id, updater);
-        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant) {
+        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant || !Property.isConstant(updater.distanceDisplayConditionProperty)) {
             this.updatersWithAttributes.set(id, updater);
         } else {
             var that = this;
@@ -165,6 +172,15 @@ define([
                 if (show !== currentShow) {
                     attributes.show = ShowGeometryInstanceAttribute.toValue(show, attributes.show);
                 }
+
+                var distanceDisplayConditionProperty = updater.distanceDisplayConditionProperty;
+                if (!Property.isConstant(distanceDisplayConditionProperty)) {
+                    var distanceDisplayCondition = distanceDisplayConditionProperty.getValue(time, distanceDisplayConditionScratch);
+                    if (!DistanceDisplayCondition.equals(distanceDisplayCondition, attributes._lastDistanceDisplayCondition)) {
+                        attributes._lastDistanceDisplayCondition = DistanceDisplayCondition.clone(distanceDisplayCondition, attributes._lastDistanceDisplayCondition);
+                        attributes.distanceDisplayCondition = DistanceDisplayConditionGeometryInstanceAttribute.toValue(distanceDisplayCondition, attributes.distanceDisplayCondition);
+                    }
+                }
             }
 
             this.updateShows(primitive);

diff --git a/Source/DataSources/StaticGeometryPerMaterialBatch.js b/Source/DataSources/StaticGeometryPerMaterialBatch.js
@@ -2,19 +2,27 @@
 define([
         '../Core/AssociativeArray',
         '../Core/defined',
+        '../Core/DistanceDisplayCondition',
+        '../Core/DistanceDisplayConditionGeometryInstanceAttribute',
         '../Core/ShowGeometryInstanceAttribute',
         '../Scene/Primitive',
         './BoundingSphereState',
-        './MaterialProperty'
+        './MaterialProperty',
+        './Property'
     ], function(
         AssociativeArray,
         defined,
+        DistanceDisplayCondition,
+        DistanceDisplayConditionGeometryInstanceAttribute,
         ShowGeometryInstanceAttribute,
         Primitive,
         BoundingSphereState,
-        MaterialProperty) {
+        MaterialProperty,
+        Property) {
     'use strict';
 
+    var distanceDisplayConditionScratch = new DistanceDisplayCondition();
+
     function Batch(primitives, appearanceType, materialProperty, closed, shadows) {
         this.primitives = primitives;
         this.appearanceType = appearanceType;
@@ -54,7 +62,7 @@ define([
         var id = updater.entity.id;
         this.updaters.set(id, updater);
         this.geometry.set(id, updater.createFillGeometryInstance(time));
-        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant) {
+        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant || !Property.isConstant(updater.distanceDisplayConditionProperty)) {
             this.updatersWithAttributes.set(id, updater);
         } else {
             var that = this;
@@ -171,6 +179,15 @@ define([
                 if (show !== currentShow) {
                     attributes.show = ShowGeometryInstanceAttribute.toValue(show, attributes.show);
                 }
+
+                var distanceDisplayConditionProperty = updater.distanceDisplayConditionProperty;
+                if (!Property.isConstant(distanceDisplayConditionProperty)) {
+                    var distanceDisplayCondition = distanceDisplayConditionProperty.getValue(time, distanceDisplayConditionScratch);
+                    if (!DistanceDisplayCondition.equals(distanceDisplayCondition, attributes._lastDistanceDisplayCondition)) {
+                        attributes._lastDistanceDisplayCondition = DistanceDisplayCondition.clone(distanceDisplayCondition, attributes._lastDistanceDisplayCondition);
+                        attributes.distanceDisplayCondition = DistanceDisplayConditionGeometryInstanceAttribute.toValue(distanceDisplayCondition, attributes.distanceDisplayCondition);
+                    }
+                }
             }
 
             this.updateShows(primitive);

diff --git a/Source/DataSources/StaticGroundGeometryColorBatch.js b/Source/DataSources/StaticGroundGeometryColorBatch.js
@@ -4,20 +4,27 @@ define([
         '../Core/Color',
         '../Core/ColorGeometryInstanceAttribute',
         '../Core/defined',
+        '../Core/DistanceDisplayCondition',
+        '../Core/DistanceDisplayConditionGeometryInstanceAttribute',
         '../Core/ShowGeometryInstanceAttribute',
         '../Scene/GroundPrimitive',
-        './BoundingSphereState'
+        './BoundingSphereState',
+        './Property'
     ], function(
         AssociativeArray,
         Color,
         ColorGeometryInstanceAttribute,
         defined,
+        DistanceDisplayCondition,
+        DistanceDisplayConditionGeometryInstanceAttribute,
         ShowGeometryInstanceAttribute,
         GroundPrimitive,
-        BoundingSphereState) {
+        BoundingSphereState,
+        Property) {
     "use strict";
 
     var colorScratch = new Color();
+    var distanceDisplayConditionScratch = new DistanceDisplayCondition();
 
     function Batch(primitives, color, key) {
         this.primitives = primitives;
@@ -42,7 +49,7 @@ define([
         this.createPrimitive = true;
         this.geometry.set(id, instance);
         this.updaters.set(id, updater);
-        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant) {
+        if (!updater.hasConstantFill || !updater.fillMaterialProperty.isConstant || !Property.isConstant(updater.distanceDisplayConditionProperty)) {
             this.updatersWithAttributes.set(id, updater);
         } else {
             var that = this;
@@ -164,6 +171,15 @@ define([
                 if (show !== currentShow) {
                     attributes.show = ShowGeometryInstanceAttribute.toValue(show, attributes.show);
                 }
+
+                var distanceDisplayConditionProperty = updater.distanceDisplayConditionProperty;
+                if (!Property.isConstant(distanceDisplayConditionProperty)) {
+                    var distanceDisplayCondition = distanceDisplayConditionProperty.getValue(time, distanceDisplayConditionScratch);
+                    if (!DistanceDisplayCondition.equals(distanceDisplayCondition, attributes._lastDistanceDisplayCondition)) {
+                        attributes._lastDistanceDisplayCondition = DistanceDisplayCondition.clone(distanceDisplayCondition, attributes._lastDistanceDisplayCondition);
+                        attributes.distanceDisplayCondition = DistanceDisplayConditionGeometryInstanceAttribute.toValue(distanceDisplayCondition, attributes.distanceDisplayCondition);
+                    }
+                }
             }
 
             this.updateShows(primitive);

diff --git a/Source/DataSources/StaticOutlineGeometryBatch.js b/Source/DataSources/StaticOutlineGeometryBatch.js
@@ -4,19 +4,25 @@ define([
         '../Core/Color',
         '../Core/ColorGeometryInstanceAttribute',
         '../Core/defined',
+        '../Core/DistanceDisplayCondition',
+        '../Core/DistanceDisplayConditionGeometryInstanceAttribute',
         '../Core/ShowGeometryInstanceAttribute',
         '../Scene/PerInstanceColorAppearance',
         '../Scene/Primitive',
-        './BoundingSphereState'
+        './BoundingSphereState',
+        './Property'
     ], function(
         AssociativeArray,
         Color,
         ColorGeometryInstanceAttribute,
         defined,
+        DistanceDisplayCondition,
+        DistanceDisplayConditionGeometryInstanceAttribute,
         ShowGeometryInstanceAttribute,
         PerInstanceColorAppearance,
         Primitive,
-        BoundingSphereState) {
+        BoundingSphereState,
+        Property) {
     'use strict';
 
     function Batch(primitives, translucent, width, shadows) {
@@ -41,7 +47,7 @@ define([
         this.createPrimitive = true;
         this.geometry.set(id, instance);
         this.updaters.set(id, updater);
-        if (!updater.hasConstantOutline || !updater.outlineColorProperty.isConstant) {
+        if (!updater.hasConstantOutline || !updater.outlineColorProperty.isConstant || !Property.isConstant(updater.distanceDisplayConditionProperty)) {
             this.updatersWithAttributes.set(id, updater);
         } else {
             var that = this;
@@ -67,6 +73,8 @@ define([
     };
 
     var colorScratch = new Color();
+    var distanceDisplayConditionScratch = new DistanceDisplayCondition();
+
     Batch.prototype.update = function(time) {
         var isUpdated = true;
         var removedCount = 0;
@@ -169,6 +177,15 @@ define([
                 if (show !== currentShow) {
                     attributes.show = ShowGeometryInstanceAttribute.toValue(show, attributes.show);
                 }
+
+                var distanceDisplayConditionProperty = updater.distanceDisplayConditionProperty;
+                if (!Property.isConstant(distanceDisplayConditionProperty)) {
+                    var distanceDisplayCondition = distanceDisplayConditionProperty.getValue(time, distanceDisplayConditionScratch);
+                    if (!DistanceDisplayCondition.equals(distanceDisplayCondition, attributes._lastDistanceDisplayCondition)) {
+                        attributes._lastDistanceDisplayCondition = DistanceDisplayCondition.clone(distanceDisplayCondition, attributes._lastDistanceDisplayCondition);
+                        attributes.distanceDisplayCondition = DistanceDisplayConditionGeometryInstanceAttribute.toValue(distanceDisplayCondition, attributes.distanceDisplayCondition);
+                    }
+                }
             }
 
             this.updateShows(primitive);