diff options
author | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
commit | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (patch) | |
tree | 49b07dfb52252ac986c567ad5c3a7c39ebcc86e2 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | 551e1f2be11e9e6ab7af17816396b88aafd57dff (diff) | |
parent | 2b9f63089534356607ad7e0ddde6f22e42d04f80 (diff) | |
download | ninja-b09956e4a9a35c5588cc7cd1f01efb617cbe0884.tar.gz |
Merge branch 'refs/heads/integration-candidate'
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 | }, |