diff options
| author | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
| commit | 3ebed34665fa73b0ce613b400f3029ebf4476439 (patch) | |
| tree | 09a3c592035030bda7bb62d1f908ce263377d74c /js/panels/properties.reel/properties.js | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz | |
Merge branch 'refs/heads/master' into dom-architecture
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 |