Merge pull request #3511 from AnalyticalGraphicsInc/billboard-clamp-t…

…o-ground Fix updating billboards on terrain multiple times in a single frame.
CesiumGS · Feb 4, 2016 · 9e80f2c · 9e80f2c
2 parents 1219c28 + 30de8c8
commit 9e80f2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@ Change Log
    *   
 * Fixed bug for causing `navigator is not defined` reference error in node
 * Added `Camera.flyHome` function for resetting the camera to the home view
+* Fix an issue when changing a billboard's position property multiple times per frame. [#3511](https://github.com/AnalyticalGraphicsInc/cesium/pull/3511)
 
 ### 1.18 - 2016-02-01
 * Breaking changes

diff --git a/Source/Scene/QuadtreePrimitive.js b/Source/Scene/QuadtreePrimitive.js
@@ -244,6 +244,14 @@ define([
         };
 
         object.removeFunc = function() {
+            var addedCallbacks = primitive._addHeightCallbacks;
+            var length = addedCallbacks.length;
+            for (var i = 0; i < length; ++i) {
+                if (addedCallbacks[i] === object) {
+                    addedCallbacks.splice(i, 1);
+                    break;
+                }
+            }
             primitive._removeHeightCallbacks.push(object);
         };