aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-24 11:41:42 -0700
committerJose Antonio Marquez2012-07-24 11:41:42 -0700
commit2b4439fed88fbb785ee14a3372ae9480d186bae4 (patch)
treef3f4a9ebde465cd3064027007dabc9857be80ed6 /js/panels
parent2f32323d6d5a65feaaa53461a80fcef297a5b65a (diff)
parent98ff98171c1f4a551760a01109ce8f0a80f0c922 (diff)
downloadninja-2b4439fed88fbb785ee14a3372ae9480d186bae4.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js9
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js4
2 files changed, 11 insertions, 2 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index c9b59253..9ad88a69 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -312,6 +312,15 @@ var Tween = exports.Tween = Montage.create(Component, {
312 this.parentComponent.parentComponent.updateKeyframeRule(); 312 this.parentComponent.parentComponent.updateKeyframeRule();
313 this.isTweenAnimated = true; 313 this.isTweenAnimated = true;
314 } 314 }
315
316 if(eventDetail.source === "pi" && eventDetail.type === "setMatrix"){
317 var piArrMat = eventDetail.data.value,
318 piStrTweenProperty = "perspective(1400) matrix3d(" + piArrMat.join() + ")";
319
320 this.tweenedProperties["-webkit-transform"] = piStrTweenProperty;
321 this.parentComponent.parentComponent.updateKeyframeRule();
322 this.isTweenAnimated = true;
323 }
315 } 324 }
316 }, 325 },
317 326
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index f4c31f53..526bab5c 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -317,9 +317,9 @@ exports.ThreeD = Montage.create(Component, {
317 } 317 }
318 318
319 if(isChanging) { 319 if(isChanging) {
320 this.application.ninja.elementMediator.setMatrix(item, mat, true); 320 this.application.ninja.elementMediator.setMatrix(item, mat, true, "pi");
321 } else { 321 } else {
322 this.application.ninja.elementMediator.setMatrix(item, mat, false); 322 this.application.ninja.elementMediator.setMatrix(item, mat, false, "pi");
323 323
324 if(!inGlobalMode) { 324 if(!inGlobalMode) {
325 value.value = 0; 325 value.value = 0;