2 files changed, 7 insertions, 2 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index d18599d6..bac722cd 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -43,7 +43,7 @@
                     "data": {
                         "boundObject": {"@": "materialsProperties"},
                         "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": false
+                        "oneway": true
                     }
                 },
                 "listeners": [
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 1237e602..db3f7652 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -681,6 +681,11 @@ exports.MaterialsPopup = Montage.create(Component, {
                     }
                 ]
     },
+
+    materialsProperties: {
+        serializable: true,
+        value: null
+    },
     
     _materialsData: {
                 enumerable: true,
@@ -697,7 +702,7 @@ exports.MaterialsPopup = Montage.create(Component, {
             },
         set: function(data) {
             this._materialsData = data;
-            if(this.materialsProperties)
+            if(this.materialsProperties && data.length)
             {
                 this.materialsProperties.needsDraw = true;
             }