Merge remote-tracking branch 'origin/master' into debugfrustum

CesiumGS · Aug 26, 2013 · c0a44fd · c0a44fd
2 parents 4a4ac0c + 8f96ef0
commit c0a44fd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Renderer/ShaderProgram.js b/Source/Renderer/ShaderProgram.js
@@ -63,7 +63,7 @@ define([
         czm_columbusViewMorph,
         czm_computePosition,
         czm_eastNorthUpToEyeCoordinates,
-        czm_czm_ellipsoidContainsPoint,
+        czm_ellipsoidContainsPoint,
         czm_ellipsoidNew,
         czm_ellipsoidWgs84TextureCoordinates,
         czm_equalsEpsilon,
@@ -2343,7 +2343,7 @@ define([
         czm_columbusViewMorph : czm_columbusViewMorph,
         czm_computePosition : czm_computePosition,
         czm_eastNorthUpToEyeCoordinates : czm_eastNorthUpToEyeCoordinates,
-        czm_czm_ellipsoidContainsPoint : czm_czm_ellipsoidContainsPoint,
+        czm_ellipsoidContainsPoint : czm_ellipsoidContainsPoint,
         czm_ellipsoidNew : czm_ellipsoidNew,
         czm_ellipsoidWgs84TextureCoordinates : czm_ellipsoidWgs84TextureCoordinates,
         czm_equalsEpsilon : czm_equalsEpsilon,