Merge branch 'master' of github.com:tiffanylu/cesium into openStreetM…

…apImageryProvider merge master
CesiumGS · Nov 19, 2015 · 5d057d7 · 5d057d7
2 parents 9694604 + 4f3b238
commit 5d057d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js
@@ -1181,7 +1181,7 @@ define([
 
         var useWebMercatorProjection = frameState.projection instanceof WebMercatorProjection;
 
-        pickCommand.shaderProgram = tileProvider._surfaceShaderSet.getShaderProgram(frameState.context, frameState.mode, useWebMercatorProjection);
+        pickCommand.shaderProgram = tileProvider._surfaceShaderSet.getPickShaderProgram(frameState.context, frameState.mode, useWebMercatorProjection);
         pickCommand.renderState = tileProvider._pickRenderState;
 
         pickCommand.owner = drawCommand.owner;

diff --git a/Source/Scene/QuadtreePrimitive.js b/Source/Scene/QuadtreePrimitive.js
@@ -258,7 +258,7 @@ define([
         }
 
         if (passes.pick && this._tilesToRender.length > 0) {
-            this._tileProvider.endUpdate(frameState);
+            this._tileProvider.updateForPick(frameState);
         }
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -258,7 +258,7 @@ define([ @@
             }
             if (passes.pick && this._tilesToRender.length > 0) {
-                this._tileProvider.endUpdate(frameState);
+                this._tileProvider.updateForPick(frameState);
             }
         };
@@ Expand Down @@