diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/panels/properties.reel/properties.js | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
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 |