diff options
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 782dd138..ca720ae7 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -166,9 +166,9 @@ exports.Properties = Montage.create(Component, { | |||
166 | this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle"); | 166 | this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle"); |
167 | this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle"); | 167 | this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle"); |
168 | this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle"); | 168 | this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle"); |
169 | } | ||
170 | } | 169 | } |
171 | } | 170 | } |
171 | } | ||
172 | }, | 172 | }, |
173 | 173 | ||
174 | handleSelectionChange: { | 174 | handleSelectionChange: { |
@@ -207,6 +207,12 @@ exports.Properties = Montage.create(Component, { | |||
207 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | 207 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); |
208 | } | 208 | } |
209 | 209 | ||
210 | if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { | ||
211 | this.threeD.flatten = false; | ||
212 | } else { | ||
213 | this.threeD.flatten = true; | ||
214 | } | ||
215 | |||
210 | if(this.customPi !== stage.elementModel.pi) { | 216 | if(this.customPi !== stage.elementModel.pi) { |
211 | // We need to unregister color chips from the previous selection from the Color Model | 217 | // We need to unregister color chips from the previous selection from the Color Model |
212 | var len = this.customSections.length; | 218 | var len = this.customSections.length; |
@@ -271,6 +277,11 @@ exports.Properties = Montage.create(Component, { | |||
271 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); | 277 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); |
272 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width")); | 278 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width")); |
273 | 279 | ||
280 | if(ElementsMediator.getProperty(el, "-webkit-transform-style") === "preserve-3d") { | ||
281 | this.threeD.flatten = false; | ||
282 | } else { | ||
283 | this.threeD.flatten = true; | ||
284 | } | ||
274 | 285 | ||
275 | if(this.threeD.inGlobalMode) | 286 | if(this.threeD.inGlobalMode) |
276 | { | 287 | { |