diff options
author | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
commit | d764428023d87446fbbb153d8e04a23b900d71d5 (patch) | |
tree | 2581815db5567b52d4c59663ea9e37d6df057ca3 /js/panels/properties/content.reel | |
parent | 3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (diff) | |
parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
download | ninja-d764428023d87446fbbb153d8e04a23b900d71d5.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/properties/content.reel')
-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]; |