Merge remote-tracking branch 'upstream/master' into fix/issue-97-layer-list-cutoff

This commit is contained in:
orangemug
2017-11-29 10:09:56 +00:00
12 changed files with 13257 additions and 31 deletions

View File

@@ -134,7 +134,7 @@ export default class LayerEditor extends React.Component {
/>
}
{this.props.layer.type !== 'raster' && this.props.layer.type !== 'background' && <LayerSourceLayerBlock
sourceLayerIds={this.props.sources[this.props.layer.source]}
sourceLayerIds={this.props.sources[this.props.layer.source].layers}
value={this.props.layer['source-layer']}
onChange={v => this.changeProperty(null, 'source-layer', v)}
/>