Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

2 files changed, 40 insertions, 2 deletions

diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 18a7369e..b6c25baf 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -22,7 +22,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "xAngleControl": {"@": "threeDRotX"},
                 "yAngleControl": {"@": "threeDRotY"},
                 "zAngleControl": {"@": "threeDRotZ"},
-                "axisModeGroupControl": {"@": "axisModeGroup"}
+                "axisModeGroupControl": {"@": "axisModeGroup"},
+                "flattenControl": {"@": "flattenCheckbox"}
             }
         },
 
@@ -242,6 +243,29 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": "Global",
                 "group": {"@": "axisModeGroup"}
             }
+        },
+        "flattenCheckbox": {
+            "module": "montage/ui/checkbox.reel",
+            "name": "Checkbox",
+            "properties": {
+                "element": {"#": "flattenCh"},
+                "identifier": "flatten",
+                "checked": false
+            },
+            "bindings": {
+                "checked": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "flatten",
+                    "oneway": false
+                }
+            },
+            "listeners": [
+                {
+                    "type": "action",
+                    "listener": {"@": "owner"},
+                    "capture": false
+                }
+            ]
         }
     }
     </script>
@@ -335,7 +359,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
         <article class="fieldRow oneCol checkbox">
             <div>
                 <div class="inputField">
-                    <input class="nj-skinned" type="checkbox" />
+                    <input id="flattenCh" class="nj-skinned" type="checkbox" />
                 </div>
                 <div>
                     <label> Flatten</label>
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index f72d1ff6..dcba51a4 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -79,6 +79,10 @@ exports.ThreeD = Montage.create(Component, {
         value: 0
     },
 
+    flatten: {
+        value: false
+    },
+
     _disableTranslation: {
         value: true
     },
@@ -107,6 +111,16 @@ exports.ThreeD = Montage.create(Component, {
         value: null
     },
 
+    handleAction: {
+        value: function(event) {
+            if(event.currentTarget.identifier === "flatten") {
+                this.application.ninja.elementMediator.setProperty([this.item],
+                                                                    "-webkit-transform-style",
+                                                                    event.currentTarget.checked ? ["flat"] : ["preserve-3d"]);
+            }
+        }
+    },
+
     handleChange: {
         value: function(event) {
             if(event.wasSetByCode) {