diff options
| author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
| commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
| tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/panels/properties.reel/properties.js | |
| parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
| parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
| download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/properties.reel/properties.js')
| -rwxr-xr-x | js/panels/properties.reel/properties.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index d3362474..700b93f3 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
| @@ -244,8 +244,8 @@ exports.Properties = Montage.create(Component, { | |||
| 244 | controls = this.customSections[n].content.controls; | 244 | controls = this.customSections[n].content.controls; |
| 245 | if(controls["colorSelect"]) { | 245 | if(controls["colorSelect"]) { |
| 246 | controls["colorSelect"].destroy(); | 246 | controls["colorSelect"].destroy(); |
| 247 | } else if(controls["background"]) { | 247 | } else if(controls["background-color"]) { |
| 248 | controls["background"].destroy(); | 248 | controls["background-color"].destroy(); |
| 249 | } | 249 | } |
| 250 | } | 250 | } |
| 251 | 251 | ||