diff options
author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels/properties.reel/properties.js | |
parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index ee90cd64..8c2daa14 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -208,11 +208,7 @@ exports.Properties = Montage.create(Component, { | |||
208 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | 208 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); |
209 | } | 209 | } |
210 | 210 | ||
211 | if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { | 211 | this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; |
212 | this.threeD.flatten = false; | ||
213 | } else { | ||
214 | this.threeD.flatten = true; | ||
215 | } | ||
216 | 212 | ||
217 | if(this.customPi !== stage.elementModel.pi) { | 213 | if(this.customPi !== stage.elementModel.pi) { |
218 | // We need to unregister color chips from the previous selection from the Color Model | 214 | // We need to unregister color chips from the previous selection from the Color Model |