From ea4f6f2a7ddef43ebce73c42393635ac25dd35b4 Mon Sep 17 00:00:00 2001
From: Dan Bagnell <daniel.p.bagnell@gmail.com>
Date: Tue, 1 Sep 2015 14:42:48 -0400
Subject: [PATCH] Fix zooming when tracking an object in 2D.
---
Source/Scene/ScreenSpaceCameraController.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Source/Scene/ScreenSpaceCameraController.js b/Source/Scene/ScreenSpaceCameraController.js
index c166d11220f1..b57d9ad5a617 100644
--- a/Source/Scene/ScreenSpaceCameraController.js
+++ b/Source/Scene/ScreenSpaceCameraController.js
@@ -465,7 +465,11 @@ define([
var camera = scene.camera;
var mode = scene.mode;
- var pickedPosition = mode !== SceneMode.SCENE2D ? pickGlobe(object, startPosition, scratchPickCartesian) : camera.getPickRay(startPosition, scratchZoomPickRay).origin;
+ var pickedPosition;
+ if (defined(object._globe)) {
+ pickedPosition = mode !== SceneMode.SCENE2D ? pickGlobe(object, startPosition, scratchPickCartesian) : camera.getPickRay(startPosition, scratchZoomPickRay).origin;
+ }
+
if (!defined(pickedPosition)) {
camera.zoomIn(distance);
return;