diff options
author | hwc487 | 2012-02-21 17:02:31 -0800 |
---|---|---|
committer | hwc487 | 2012-02-21 17:02:31 -0800 |
commit | f06f44ab3fcca109f126eae4f6fb915c5dd28791 (patch) | |
tree | c25fbfedf93c135be53f1e9238f7ddcf498612bc /js/panels/properties | |
parent | bd7bc833895391e4974b8746f31f63ba70689df3 (diff) | |
parent | d2f4d5e5f6742d53b6324d585a700566f73c992a (diff) | |
download | ninja-f06f44ab3fcca109f126eae4f6fb915c5dd28791.tar.gz |
Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integration
Diffstat (limited to 'js/panels/properties')
-rwxr-xr-x | js/panels/properties/content.reel/content.js | 2 |
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]; |