diff options
| author | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
| commit | 4419209a1fd850ab468209b562b66b0242b42a9c (patch) | |
| tree | bd7ca04f963f5a3aeb4b3c06db6f187903307d45 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 1b68bb87c458877cb850a96d8a093d6064bc41dc (diff) | |
| parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
| download | ninja-4419209a1fd850ab468209b562b66b0242b42a9c.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 158d666e..26d045d6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -62,6 +62,11 @@ | |||
| 62 | "boundObject" : {"@": "tweenRepetition"}, | 62 | "boundObject" : {"@": "tweenRepetition"}, |
| 63 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated", | 63 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated", |
| 64 | "oneway" : false | 64 | "oneway" : false |
| 65 | }, | ||
| 66 | "isClearing" : { | ||
| 67 | "boundObject" : {"@": "tweenRepetition"}, | ||
| 68 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing", | ||
| 69 | "oneway" : false | ||
| 65 | } | 70 | } |
| 66 | } | 71 | } |
| 67 | }, | 72 | }, |