Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1

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, {
                         this.parentComponent.parentComponent.updateKeyframeRule();
                         this.isTweenAnimated = true;
                 }
+
+            if(eventDetail.source === "pi" && eventDetail.type === "setMatrix"){
+                var piArrMat = eventDetail.data.value,
+                    piStrTweenProperty = "perspective(1400) matrix3d(" + piArrMat.join() + ")";
+
+                this.tweenedProperties["-webkit-transform"] = piStrTweenProperty;
+                this.parentComponent.parentComponent.updateKeyframeRule();
+                this.isTweenAnimated = true;
+            }
         }
     },
 
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, {
             }
 
             if(isChanging) {
-                this.application.ninja.elementMediator.setMatrix(item, mat, true);
+                this.application.ninja.elementMediator.setMatrix(item, mat, true, "pi");
             } else {
-                this.application.ninja.elementMediator.setMatrix(item, mat, false);
+                this.application.ninja.elementMediator.setMatrix(item, mat, false, "pi");
 
                 if(!inGlobalMode) {
                     value.value = 0;