diff options
author | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
commit | 5fb358d9e80a364d5f300d60b7a9fe0f773741e7 (patch) | |
tree | 2c4d5292b19c91697dffb542f369ec9dcb340f77 /js/panels/Materials/materials-popup.reel | |
parent | 5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-5fb358d9e80a364d5f300d60b7a9fe0f773741e7.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 3 |
1 files changed, 2 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 508b8130..c57bb2d7 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
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 | var Button = require("js/components/button.reel").Button; |
10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
10 | 11 | ||
11 | //////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////// |
12 | //Exporting as MaterialsPopup | 13 | //Exporting as MaterialsPopup |
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
223 | (materialID === "RadialGradientMaterial") | 224 | (materialID === "RadialGradientMaterial") |
224 | ) | 225 | ) |
225 | { | 226 | { |
226 | var material = MaterialsLibrary.getMaterial( materialID ); | 227 | var material = MaterialsModel.getMaterial( materialID ); |
227 | if (material) | 228 | if (material) |
228 | { | 229 | { |
229 | this._material = material; | 230 | this._material = material; |