aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 11:05:00 -0800
committerValerio Virgillito2012-03-06 11:05:00 -0800
commit4540b5b4ea2065c3e0d67b46bba8b6764801fbea (patch)
tree4e1561530b1b90ea497bac8e41d193fa605e98b4 /js/panels/Materials/materials-popup.reel
parent4e35725e6c9044c37bef28b8c8d36f4b5c89bfd9 (diff)
parent84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff)
downloadninja-4540b5b4ea2065c3e0d67b46bba8b6764801fbea.tar.gz
Merge branch 'refs/heads/master' into panels
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;