Merge branch 'master' into pentool

2 files changed, 16 insertions, 23 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index ae0ee2c8..9fdbc00d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -14,32 +14,28 @@
                 <script type="text/montage-serialization">
         {
             "okButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
+                "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "mp_ok_btn"},
                     "label": "OK"
                 }
             },
             "cancelButton": {
-                "module": "montage/ui/button.reel",
-                "name": "Button",
+                "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "mp_cancel_btn"},
                     "label": "Cancel"
                 }
             },
             "eventDelegator": {
-                "module": "montage/core/event/action-event-listener",
-                "name": "ActionEventListener",
+                "prototype": "montage/core/event/action-event-listener",
                 "properties": {
                     "handler": {"@": "owner"},
                     "action": "updatePreview"
                 }
             },
             "propControl1": {
-                "module": "js/components/ui/property-control.reel",
-                "name": "PropertyControl",
+                "prototype": "js/components/ui/property-control.reel",
                 "properties": {
                     "element": {"#": "mp_property"}
                 },
@@ -64,8 +60,7 @@
                             ]
             },
             "materialsProperties": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "mp_properties_list"}
                 },
@@ -78,8 +73,7 @@
                 }
             },
             "owner": {
-                "module": "js/panels/Materials/materials-popup.reel",
-                "name": "MaterialsPopup",
+                "prototype": "js/panels/Materials/materials-popup.reel",
                 "properties": {
                     "materialsProperties": {"@": "materialsProperties"},
                     "element": {"#": "materials_popup"},
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bbccf45d..bd10f7a5 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -214,10 +214,9 @@ exports.MaterialsPopup = Montage.create(Component, {
                 enumerable: true,
                 value: function(materialID)
                 {
-            // Note that setting Array.length = 0 will empty arrays,
-            // which is fine if you use getMaterialData to get a new array, but not for the
-            // dummyData arrays.
-            this._materialsData.length = 0;
+            //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
+            this.materialsData = [];
+
             this._materialName = materialID;
             if(
                                         (materialID ===  "UberMaterial")                                ||
@@ -231,16 +230,14 @@ exports.MaterialsPopup = Montage.create(Component, {
                                 if (material)
                                 {
                                         this._material = material;
-                                        var matData = this.getMaterialData( material );
-                                        this.materialsData = matData;
+                    this.materialsData = this.getMaterialData( material );
                                 }
             }
             else
             {
-                this.materialsData = this._dummyData1.slice(0);
+                this.materialsData = this[materialID];
             }
-            
-           this.needsDraw = true;
+            this.needsDraw = true;
                 }
         },
 
@@ -445,7 +442,8 @@ exports.MaterialsPopup = Montage.create(Component, {
                 }
         },
 
-    _dummyData1: {
+    // _dummyData1
+    CheckerBoard: {
         value: [
             {
                 "label":         "Texture1",
@@ -588,7 +586,8 @@ exports.MaterialsPopup = Montage.create(Component, {
         ]
     },
 
-    _dummyData2: {
+    // _dummyData2
+    ShinyMetal: {
         value: [
                     {
                         "label":         "Diffuse",