diff options
author | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
commit | 846d539997bf188b9caf63cdf0008367fe6c9ede (patch) | |
tree | ae0ed9293cd5859cd10694fb2e045b2101ed8df8 /js/panels/Materials/materials-popup.reel/materials-popup.js | |
parent | 595a569cf459e7e7cbe19e546c23322b56e44341 (diff) | |
parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
download | ninja-846d539997bf188b9caf63cdf0008367fe6c9ede.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index c57bb2d7..b44761bc 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -5,9 +5,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component, |
9 | var Button = require("js/components/button.reel").Button; | 9 | MaterialsModel = require("js/models/materials-model").MaterialsModel; |
10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
11 | 10 | ||
12 | //////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////// |
13 | //Exporting as MaterialsPopup | 12 | //Exporting as MaterialsPopup |
@@ -215,7 +214,11 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
215 | enumerable: true, | 214 | enumerable: true, |
216 | value: function(materialID) | 215 | value: function(materialID) |
217 | { | 216 | { |
218 | 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; | ||
219 | if( | 222 | if( |
220 | (materialID === "UberMaterial") || | 223 | (materialID === "UberMaterial") || |
221 | (materialID === "FlatMaterial") || | 224 | (materialID === "FlatMaterial") || |