diff options
author | Jonathan Duran | 2012-07-19 10:19:41 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-19 10:19:41 -0700 |
commit | 6431037185722a63064c2f2fb31fe0e325c9653a (patch) | |
tree | 40d3448dd69a94bddac22cf39b4875eee5615684 /js/panels/Timeline/Tween.reel/Tween.js | |
parent | 142dc59794769ad783ab050b27b4f56ac5773afb (diff) | |
download | ninja-6431037185722a63064c2f2fb31fe0e325c9653a.tar.gz |
FIx 3D animation workflow
Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 0f567fbd..e3f9e71a 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -299,6 +299,10 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
299 | this.parentComponent.parentComponent.updateKeyframeRule(); | 299 | this.parentComponent.parentComponent.updateKeyframeRule(); |
300 | this.isTweenAnimated = true; | 300 | this.isTweenAnimated = true; |
301 | } | 301 | } |
302 | |||
303 | if(!this.parentComponent.parentComponent.enabled3D){ | ||
304 | this.parentComponent.parentComponent.initial3DforAllTweens(); | ||
305 | } | ||
302 | 306 | ||
303 | if (eventDetail.source === "translateTool" || eventDetail.source === "rotateTool") { | 307 | if (eventDetail.source === "translateTool" || eventDetail.source === "rotateTool") { |
304 | var arrMat = eventDetail.data.value[0].properties.mat, | 308 | var arrMat = eventDetail.data.value[0].properties.mat, |