aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorJon Reid2012-03-06 14:14:01 -0800
committerJon Reid2012-03-06 14:14:01 -0800
commit60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch)
tree0087ad093418638ff1d0b4362715bd7b2d147eba /js/panels/Materials
parentd64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff)
parent342fb451bd251358068a0dcb10e9dc218b79a176 (diff)
downloadninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'js/panels/Materials')
-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;