aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 13:38:42 -0700
committerValerio Virgillito2012-03-20 13:38:42 -0700
commit9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (patch)
treeb6c35ce69c667f3ee8c16cc5e9a86021a4646288 /js/panels/Materials/materials-popup.reel
parentafe4b3d6567a35586e970682d71cba61c416e496 (diff)
parent634358d2697d9668bb9406ac7a029aafae542285 (diff)
downloadninja-9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18.tar.gz
Merge pull request #129 from mqg734/WebGLMaterials
Added Montage button as a valid PI control and used it to invoke the edit material popup.
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 193e72b7..b44761bc 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -214,7 +214,11 @@ exports.MaterialsPopup = Montage.create(Component, {
214 enumerable: true, 214 enumerable: true,
215 value: function(materialID) 215 value: function(materialID)
216 { 216 {
217 this._materialName = materialID; 217 // Note that setting Array.length = 0 will empty arrays,
218 // which is fine if you use getMaterialData to get a new array, but not for the
219 // dummyData arrays.
220 this._materialsData.length = 0;
221 this._materialName = materialID;
218 if( 222 if(
219 (materialID === "UberMaterial") || 223 (materialID === "UberMaterial") ||
220 (materialID === "FlatMaterial") || 224 (materialID === "FlatMaterial") ||