Skip to content

Commit

Permalink
Fix #2664.
Browse files Browse the repository at this point in the history
  • Loading branch information
emackey committed Apr 27, 2015
1 parent 17261d2 commit b983ac9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Source/Scene/CameraEventAggregator.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ define([
aggregator._buttonsDown++;
isDown[key] = true;
pressTime[key] = new Date();
Cartesian2.clone(event.position, eventStartPosition[key]);
}, ScreenSpaceEventType.PINCH_START, modifier);

aggregator._eventHandler.setInputAction(function() {
Expand Down Expand Up @@ -418,7 +417,7 @@ define([
}
//>>includeEnd('debug');

if (type === CameraEventType.WHEEL) {
if (type === CameraEventType.WHEEL || type === CameraEventType.PINCH) {
return this._currentMousePosition;
}

Expand Down

0 comments on commit b983ac9

Please sign in to comment.