aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-06 14:09:44 -0800
committerNivesh Rajbhandari2012-03-06 14:09:44 -0800
commit792793cd3991032b4840ade67f98ae8eae2d30a0 (patch)
tree69d3df003d2bb58fa1ab562fbd1058ff91851f01 /js/panels/Materials/materials-popup.reel
parent2346d8ab9db06573d8672c64988c46b6c672e015 (diff)
parent1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff)
downloadninja-792793cd3991032b4840ade67f98ae8eae2d30a0.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js3
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
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9var Button = require("js/components/button.reel").Button; 9var Button = require("js/components/button.reel").Button;
10var 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;