aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties
diff options
context:
space:
mode:
authormqg7342012-02-21 16:49:11 -0800
committermqg7342012-02-21 16:49:11 -0800
commitd2f4d5e5f6742d53b6324d585a700566f73c992a (patch)
tree8a3de8de6dc5ac5f6f3f0795d00a7d2d788374d7 /js/panels/properties
parentabf78e2d7a97d295ce5a1c425fd359d47379137e (diff)
downloadninja-d2f4d5e5f6742d53b6324d585a700566f73c992a.tar.gz
Updated Materials Library and Materials Editor Popup to work with latest version of Montage.
We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
Diffstat (limited to 'js/panels/properties')
-rwxr-xr-xjs/panels/properties/content.reel/content.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 53926c78..9b6416c7 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -163,7 +163,7 @@ exports.Content = Montage.create(Component, {
163 // For now hardcode the background since it is the only custom property 163 // For now hardcode the background since it is the only custom property
164 // No need to loop through all the properties. 164 // No need to loop through all the properties.
165 var backgroundChip = this.customSections[0].content.controls["background"]; 165 var backgroundChip = this.customSections[0].content.controls["background"];
166 backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background"); 166 backgroundChip.color = ElementsMediator.getProperty(stage, "background");
167 167
168 /* 168 /*
169 var customPI = PiData[this.customPi]; 169 var customPI = PiData[this.customPi];