Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id

Conflicts:
	js/components/tools-properties/tag-properties.reel/tag-properties.html

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

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, {
                 this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle");
             }
 
-            if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") {
-                this.threeD.flatten = false;
-            } else {
-                this.threeD.flatten = true;
-            }
+            this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d";
 
             if(this.customPi !== stage.elementModel.pi) {
                 // We need to unregister color chips from the previous selection from the Color Model