Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 3 insertions, 0 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index dcc139a5..db368caf 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -271,6 +271,9 @@ var Tween = exports.Tween = Montage.create(Component, {
             // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2)
             this.tweenedProperties["-webkit-animation-timing-function"] = easeType;
             if(this.parentComponent.parentComponent.isSubproperty){
+                if(this.parentComponent.parentComponent.trackType == "position"){
+                    return;
+                }
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
             } else {
                 this.parentComponent.parentComponent.updateKeyframeRule();