diff options
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 0f567fbd..c9b59253 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, |
@@ -373,6 +377,12 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
373 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); | 377 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); |
374 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween"); | 378 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween"); |
375 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween"); | 379 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween"); |
380 | |||
381 | if(this.parentComponent.parentComponent.enabled3D){ | ||
382 | var current3DMatrix = this.tweenedProperties["-webkit-transform"]; | ||
383 | this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "-webkit-transform", [current3DMatrix], "Change", "tween"); | ||
384 | } | ||
385 | |||
376 | } | 386 | } |
377 | } | 387 | } |
378 | }, | 388 | }, |