diff options
| author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
| commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
| tree | 95aee6605f1018550875812166d292554830d7ca /js/panels/presets/animations-presets.reel | |
| parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/presets/animations-presets.reel')
| -rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index 6a16da54..92437cfd 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
| @@ -23,6 +23,6 @@ exports.AnimationsLibrary = Montage.create(Component, { | |||
| 23 | handleNodeActivation: { | 23 | handleNodeActivation: { |
| 24 | value: function(presetData) { | 24 | value: function(presetData) { |
| 25 | this.application.ninja.presetsController.applyPreset(presetData); | 25 | this.application.ninja.presetsController.applyPreset(presetData); |
| 26 | } | 26 | } |
| 27 | } | 27 | } |
| 28 | }); | 28 | }); |