From 84332ab81c1b445195f1d9be8bbeae0725c8e758 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 6 Mar 2012 10:58:25 -0800 Subject: Squashed commit of preload-fix into Master - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito --- js/panels/Materials/materials-popup.reel/materials-popup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js') 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 var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; var Button = require("js/components/button.reel").Button; +var MaterialsModel = require("js/models/materials-model").MaterialsModel; //////////////////////////////////////////////////////////////////////// //Exporting as MaterialsPopup @@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, { (materialID === "RadialGradientMaterial") ) { - var material = MaterialsLibrary.getMaterial( materialID ); + var material = MaterialsModel.getMaterial( materialID ); if (material) { this._material = material; -- cgit v1.2.3