Merge branch 'refs/heads/ninja-internal' into ToolFixes

5 files changed, 25 insertions, 0 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 57394bb9..1c599a32 100644..100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -21,6 +21,18 @@ exports.AppModel = Montage.create(Component, {
             this._livePreview = value;
         }
     },
+    _chromePreview: {
+        value: false
+    },
+
+    chromePreview: {
+        get: function() {
+            return this._chromePreview;
+        },
+        set: function(value) {
+            this._chromePreview = value;
+        }
+    },
 
     _layoutView: {
         value: "layoutAll"
@@ -325,6 +337,19 @@ exports.AppModel = Montage.create(Component, {
         }
     },
 
+    _presetsPanel: {
+        value: true
+    },
+
+    PresetsPanel: {
+        get: function() {
+            return this._presetsPanel;
+        },
+        set: function(value) {
+            this._presetsPanel = value;
+        }
+    },
+
     _materials: {
         value: []
     },
diff --git a/js/models/color-model.js b/js/models/color-model.js
index 2c86422f..2c86422f 100644..100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 831e8b1e..831e8b1e 100644..100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index cf4a045f..cf4a045f 100644..100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index 58a88fd0..58a88fd0 100644..100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js