diff options
| author | Jon Reid | 2012-07-11 09:37:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-11 09:37:10 -0700 |
| commit | 3bea1cb3fb53bac17daa31f4b5cf561fbd040dda (patch) | |
| tree | 860511066f8566f3371a053725c6545e3f871c62 /js/panels/Timeline/PropertyTrack.reel | |
| parent | 65a9d88691a9f10130ebd853492dab0d59f4aa53 (diff) | |
| parent | f4c9d9360918f41a8a067bd1d93d59982819938b (diff) | |
| download | ninja-3bea1cb3fb53bac17daa31f4b5cf561fbd040dda.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index b2683d30..12e87636 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
| @@ -303,7 +303,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
| 303 | newTween; | 303 | newTween; |
| 304 | 304 | ||
| 305 | selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 305 | selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
| 306 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | 306 | this.application.ninja.timeline.selectLayers([selectedIndex]); |
| 307 | 307 | ||
| 308 | currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 308 | currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
| 309 | currentMillisec = currentMillisecPerPixel * clickPos; | 309 | currentMillisec = currentMillisecPerPixel * clickPos; |